Skip to content

Repro for RSRP-502346: Convert to slnx breaks cleanupcode #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bkoelman wants to merge 1 commit into
base: master
Choose a base branch
from
+65 −484
Draft

Repro for RSRP-502346: Convert to slnx breaks cleanupcode #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:
env:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
SOLUTION_FILE: JsonApiDotNetCore.sln
SOLUTION_FILE: JsonApiDotNetCore.slnx

jobs:
build-and-test:
Expand Down
479 changes: 0 additions & 479 deletions JsonApiDotNetCore.sln
View file
Open in desktop

This file was deleted.

54 changes: 54 additions & 0 deletions JsonApiDotNetCore.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/benchmarks/">
<Project Path="benchmarks/Benchmarks.csproj" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".github/workflows/build.yml" />
<File Path=".gitignore" />
<File Path="CodingGuidelines.ruleset" />
<File Path="CSharpGuidelinesAnalyzer.config" />
<File Path="Directory.Build.props" />
<File Path="package-versions.props" />
<File Path="tests.runsettings" />
</Folder>
<Folder Name="/src/">
<Project Path="src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj" />
<Project Path="src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj" />
<Project Path="src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj" />
<Project Path="src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj" />
<Project Path="src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj" />
<Project Path="src/JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
</Folder>
<Folder Name="/src/Examples/">
<Project Path="src/Examples/DapperExample/DapperExample.csproj" />
<Project Path="src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj" />
<Project Path="src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
<Project Path="src/Examples/MultiDbContextExample/MultiDbContextExample.csproj" />
<Project Path="src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj" />
<Project Path="src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj" />
<Project Path="src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj" />
<Project Path="src/Examples/ReportsExample/ReportsExample.csproj" />
</Folder>
<Folder Name="/test/">
<Project Path="test/AnnotationTests/AnnotationTests.csproj" />
<Project Path="test/DapperTests/DapperTests.csproj" />
<Project Path="test/DiscoveryTests/DiscoveryTests.csproj" />
<Project Path="test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj" />
<Project Path="test/MultiDbContextTests/MultiDbContextTests.csproj" />
<Project Path="test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj" />
<Project Path="test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj" />
<Project Path="test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj" />
<Project Path="test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj" />
<Project Path="test/OpenApiTests/OpenApiTests.csproj" />
<Project Path="test/SourceGeneratorTests/SourceGeneratorTests.csproj" />
<Project Path="test/TestBuildingBlocks/TestBuildingBlocks.csproj" />
<Project Path="test/UnitTests/UnitTests.csproj" />
</Folder>
<Project Path="src/Examples/GettingStarted/GettingStarted.csproj" DefaultStartup="true" />
</Solution>
2 changes: 1 addition & 1 deletion JsonApiDotNetCore.sln.DotSettings → JsonApiDotNetCore.slnx.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002EThrowExpressionNullCheckPattern/@EntryIndexedValue">3000</s:Int64>
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/PropagateAnnotations/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=swagger_002Ejson/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=83FF097C_002DC8C6_002D477B_002D9FAB_002DDF99B84978B5_002Ff_003AReadOnlySet_002Ecs/@EntryIndexedValue">83FF097C-C8C6-477B-9FAB-DF99B84978B5/f:ReadOnlySet.cs</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=58FE19B6_002DF84A_002D990C_002DB25F_002DE37C391C3BD3_002Ff_003AReadOnlySet_002Ecs/@EntryIndexedValue">58FE19B6-F84A-990C-B25F-E37C391C3BD3/f:ReadOnlySet.cs</s:String>
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Eg_002Ejson/@EntryIndexedValue">swagger.g.json</s:String>
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Ejson/@EntryIndexedValue">swagger.json</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
Expand Down
2 changes: 1 addition & 1 deletion cleanupcode.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dotnet tool restore
dotnet restore /p:NuGetAudit=false
dotnet build --no-restore --configuration Release /p:RunAnalyzers=false

$solutionFile = 'JsonApiDotNetCore.sln'
$solutionFile = 'JsonApiDotNetCore.slnx'

if ($revision) {
$headCommitHash = git rev-parse HEAD
Expand Down
2 changes: 1 addition & 1 deletion inspectcode.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $PSNativeCommandUseErrorActionPreference = $true

dotnet tool restore

$solutionFile = 'JsonApiDotNetCore.sln'
$solutionFile = 'JsonApiDotNetCore.slnx'
$outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
$resultPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.html')

Expand Down
8 changes: 7 additions & 1 deletion test/TestBuildingBlocks/IntegrationTestContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,13 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
{
// We have placed an appsettings.json in the TestBuildingBlocks project directory and set the content root to there. Note that
// controllers are not discovered in the content root, but are registered manually using IntegrationTestContext.UseController.
builder.UseSolutionRelativeContentRoot($"test/{nameof(TestBuildingBlocks)}");
builder.UseSolutionRelativeContentRoot($"test/{nameof(TestBuildingBlocks)}"
#if !NET10_0_OR_GREATER
// This only works when Startup class lives in the TestBuildingBlocks project.
// See https://github.com/dotnet/aspnetcore/issues/61304#issuecomment-2796228582.
, "*.slnx"
#endif
);
}

protected override IHostBuilder CreateHostBuilder()
Expand Down
Loading