Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ jobs:
- template: support/install-dotnet.yml@rsg
parameters:
DotNetSdk:
- '2.1.x'
- '3.1.x'
- '5.0.x'
- '8.0.x'
- '9.0.x'
- '10.0.x'

- task: DotNetCoreCLI@2
displayName: 'dotnet tool restore'
Expand Down
2 changes: 1 addition & 1 deletion .build/Solution.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Build;

internal class LocalConstants

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)

Check warning on line 9 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

Type 'LocalConstants' can be sealed because it has no subtypes in its containing assembly and is not externally visible (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852)
{
public static string[] PathsIgnore => new[]
{
Expand Down Expand Up @@ -100,7 +100,7 @@
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
.First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase))
.ConfigureStep<CheckoutStep>(step => step.FetchDepth = 0)
.UseDotNetSdks("3.1", "6.0", "8.0", "9.0")
.UseDotNetSdks("8.0", "9.0", "10.0")
.AddNuGetCache()
.AddVscodeExtensionTests()
.PublishLogs<Solution>()
Expand All @@ -111,7 +111,7 @@
}
}

public static class Extensions

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)

Check warning on line 114 in .build/Solution.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest)

The type name Extensions conflicts in whole or in part with the namespace name 'Azure.Core.Extensions'. Change either name to eliminate the conflict. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1724)
{
public static RocketSurgeonsGithubActionsJob AddVscodeExtensionTests(this RocketSurgeonsGithubActionsJob job)
{
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,18 @@ jobs:
with:
path: '${{ github.workspace }}/.nuget/packages'
key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/dotnet-tools.json') }}"
- name: 🔨 Use .NET Core 3.1 SDK
uses: actions/[email protected]
with:
dotnet-version: '3.1.x'
- name: 🔨 Use .NET Core 6.0 SDK
uses: actions/[email protected]
with:
dotnet-version: '6.0.x'
- name: 🔨 Use .NET Core 8.0 SDK
- name: 🔨 Use .NET 8.0 SDK
uses: actions/[email protected]
with:
dotnet-version: '8.0.x'
- name: 🔨 Use .NET Core 9.0 SDK
- name: 🔨 Use .NET 9.0 SDK
uses: actions/[email protected]
with:
dotnet-version: '9.0.x'
- name: 🔨 Use .NET 10.0 SDK
uses: actions/[email protected]
with:
dotnet-version: '10.0.x'
- name: 🎁 dotnet tool restore
run: |
dotnet tool restore
Expand Down
20 changes: 10 additions & 10 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
</ItemGroup>
<ItemGroup>
<!-- backwards compat is maintained in Directory.Packages.supports.props -->
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.11" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
Expand All @@ -50,15 +50,15 @@
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="System.Reactive" Version="6.1.0" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.11" />
<PackageVersion Include="System.Threading.Channels" Version="9.0.11" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
<PackageVersion Include="System.Threading.Channels" Version="10.0.0" />
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
<PackageVersion Include="MediatR" Version="12.4.1" />
<PackageVersion Include="Bogus" Version="35.6.5" />
<PackageVersion Include="Snapper" Version="2.4.1" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
<PackageVersion Include="Nerdbank.Streams" Version="2.13.16" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="DryIoc.Internal" Version="5.4.3" />
</ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.supports.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<Project>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
<!-- Lower bound for most target frameworks -->
<PackageVersion Update="Microsoft.Extensions.Logging" Version="2.2.0" />
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="2.2.0" />
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="2.2.0" />
<PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageVersion Update="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="10.0.0" />
<PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.307",
"version": "10.0.100",
"rollForward": "latestMinor"
}
}
Loading