Skip to content

Commit abec76f

Browse files
committed
Remove leftover .orig files and fix stray lowercase MoBi.R paths
Cleanup of artifacts flagged during the #2441 review: - Delete merge-leftover .orig files (RunActiveSimulationCommand.cs.orig, ProjectTaskSpecs.cs.orig) that still contained conflict markers. - Correct the wrong-case "src\Mobi.R" project paths in MoBi.sln and MoBi.R.Tests.csproj to "src\MoBi.R", and drop the duplicate src/Mobi.R/Domain/SimulationCreationResult.cs it produced. These are distinct paths on case-sensitive (Linux) CI.
1 parent 08dbb8a commit abec76f

5 files changed

Lines changed: 2 additions & 874 deletions

File tree

MoBi.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.CLI", "src\MoBi.CLI\Mo
4242
EndProject
4343
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.CLI.Core", "src\MoBi.CLI.Core\MoBi.CLI.Core.csproj", "{8D21EB6A-9F65-4AD0-9D91-8C94195EE121}"
4444
EndProject
45-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.R", "src\Mobi.R\MoBi.R.csproj", "{259DA791-3352-4BFA-AB42-BE0F07621FFF}"
45+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.R", "src\MoBi.R\MoBi.R.csproj", "{259DA791-3352-4BFA-AB42-BE0F07621FFF}"
4646
EndProject
4747
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.R.Tests", "tests\MoBi.R.Tests\MoBi.R.Tests.csproj", "{FC91836B-185D-40A8-A483-8B515D4C49BE}"
4848
EndProject

src/MoBi.Presentation/UICommand/RunActiveSimulationCommand.cs.orig

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/Mobi.R/Domain/SimulationCreationResult.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

tests/MoBi.R.Tests/MoBi.R.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<ItemGroup>
3333
<ProjectReference Include="..\..\src\MoBi.Core\MoBi.Core.csproj" />
34-
<ProjectReference Include="..\..\src\Mobi.R\MoBi.R.csproj" />
34+
<ProjectReference Include="..\..\src\MoBi.R\MoBi.R.csproj" />
3535
<ProjectReference Include="..\MoBi.HelpersForTests\MoBi.HelpersForTests.csproj" />
3636
</ItemGroup>
3737

0 commit comments

Comments
 (0)