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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ jobs:
dotnet-version: 10.0.x

- name: Restore
run: dotnet restore d2lang-cs.sln
run: dotnet restore d2lang-cs.slnx

- name: Build
run: dotnet build d2lang-cs.sln --configuration Release --no-restore -p:ContinuousIntegrationBuild=true
run: dotnet build d2lang-cs.slnx --configuration Release --no-restore -p:ContinuousIntegrationBuild=true

- name: Install pinned D2 CLI
if: runner.os == 'Linux'
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
dotnet-version: 10.0.x

- name: Restore
run: dotnet restore d2lang-cs.sln
run: dotnet restore d2lang-cs.slnx

- name: Pack core package with package validation
run: dotnet pack src/d2lang-cs.csproj --configuration Release --no-restore --output artifacts/packages -p:ContinuousIntegrationBuild=true -p:EnablePackageValidation=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
echo "version=$version" >> "$GITHUB_OUTPUT"

- name: Restore
run: dotnet restore d2lang-cs.sln
run: dotnet restore d2lang-cs.slnx

- name: Test
run: dotnet test test/Tests.csproj --configuration Release --no-restore -p:ContinuousIntegrationBuild=true
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ git switch -c feature/short-description
Restore, build, and test from the repository root:

```bash
dotnet restore d2lang-cs.sln
dotnet build d2lang-cs.sln --configuration Release --no-restore
dotnet restore d2lang-cs.slnx
dotnet build d2lang-cs.slnx --configuration Release --no-restore
dotnet test test/Tests.csproj --configuration Release --no-build
```

Expand Down
48 changes: 0 additions & 48 deletions d2lang-cs.sln

This file was deleted.

8 changes: 8 additions & 0 deletions d2lang-cs.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Solution>
<Folder Name="/example/">
<Project Path="example/cli/d2-sample-cli.csproj" />
</Folder>
<Project Path="src/d2lang-cs.csproj" />
<Project Path="src/D2Lang.EntityFrameworkCore/D2Lang.EntityFrameworkCore.csproj" />
<Project Path="test/Tests.csproj" />
</Solution>