Skip to content

Commit 37ddfac

Browse files
committed
migrate to slnx, make things buildable
1 parent da5d572 commit 37ddfac

15 files changed

Lines changed: 78 additions & 840 deletions

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,39 +30,22 @@ jobs:
3030
with:
3131
global-json-file: global.json
3232
- name: Install dependencies
33-
run: dotnet restore EntityFrameworkCore.Triggered.sln -p:Configuration=Release
33+
run: dotnet restore EntityFrameworkCore.Triggered.slnx -p:Configuration=Release
3434
- name: Build
35-
run: dotnet build --configuration Release --no-restore EntityFrameworkCore.Triggered.sln
35+
run: dotnet build --configuration Release --no-restore EntityFrameworkCore.Triggered.slnx
3636
- name: Test
37-
run: dotnet test --configuration Release --verbosity normal EntityFrameworkCore.Triggered.sln
37+
run: dotnet test --configuration Release --verbosity normal EntityFrameworkCore.Triggered.slnx
3838
- name: Pack
3939
if: matrix.os == 'ubuntu-latest'
4040
run: |
41-
dotnet pack -v normal --configuration Release --include-symbols --include-source -p:PackageVersion=3-pre-$GITHUB_RUN_ID -o nupkg EntityFrameworkCore.Triggered.Core.slnf
41+
dotnet pack -v normal --configuration Release --include-symbols --include-source -p:PackageVersion=4-pre-$GITHUB_RUN_ID -o nupkg EntityFrameworkCore.Triggered.slnx
4242
- name: Upload Artifact
4343
if: matrix.os == 'ubuntu-latest'
4444
uses: actions/upload-artifact@v4
4545
with:
4646
name: nupkg
4747
path: ./nupkg/*.nupkg
4848

49-
build-samples:
50-
strategy:
51-
matrix:
52-
os: [ubuntu-latest, windows-latest, macos-latest]
53-
runs-on: ${{ matrix.os }}
54-
55-
steps:
56-
- uses: actions/checkout@v4
57-
- name: Setup .NET Core
58-
uses: actions/setup-dotnet@v4
59-
with:
60-
global-json-file: global.json
61-
- name: Install dependencies
62-
run: dotnet restore EntityFrameworkCore.Triggered.Samples.slnf
63-
- name: Build
64-
run: dotnet build --configuration Release --no-restore EntityFrameworkCore.Triggered.Samples.slnf
65-
6649
prerelease:
6750
needs: build
6851
if: github.ref == 'refs/heads/master'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo Version: $VERSION
3434
VERSION="${VERSION:1}"
3535
echo Clean Version: $VERSION
36-
dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg EntityFrameworkCore.Triggered.Core.slnf
36+
dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg EntityFrameworkCore.Triggered.slnx
3737
- name: Push to GitHub Feed
3838
run: |
3939
for f in ./nupkg/*.nupkg

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"nuget",
66
"optionsBuilder",
77
"triggerOptions"
8-
]
8+
],
9+
"dotnet.defaultSolution": "EntityFrameworkCore.Triggered.slnx"
910
}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<None Include="$(SolutionDir)\README.md" Pack="true" PackagePath="\" />
21+
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
2222
</ItemGroup>
2323

2424
</Project>

‎Directory.Packages.props‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,26 @@
44
</PropertyGroup>
55
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
66
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
7-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
8-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
7+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.31" />
8+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.31" />
99
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.10" />
1010
</ItemGroup>
1111
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
1212
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
13-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
14-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.20" />
14+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.20" />
1515
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
1818
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
20+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12" />
2121
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
2525
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
2626
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
27-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2827
<PackageVersion Include="Verify.Xunit" Version="31.12.5" />
2928
<PackageVersion Include="xunit" Version="2.9.3" />
3029
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

‎EntityFrameworkCore.Triggered.Analyzers/EntityFrameworkCore.Triggered.Analyzers.CodeFixes/EntityFrameworkCore.Triggered.Analyzers.CodeFixes.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<IsPackable>false</IsPackable>
56
</PropertyGroup>
67

78
<ItemGroup>

‎EntityFrameworkCore.Triggered.Analyzers/EntityFrameworkCore.Triggered.Analyzers/EntityFrameworkCore.Triggered.Analyzers.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
66
<IsRoslynComponent>true</IsRoslynComponent>
7+
<IsPackable>false</IsPackable>
8+
<!-- Avoids a NuGet restore clash with the PackageId of EntityFrameworkCore.Triggered.Analyzers.Package -->
9+
<PackageId>EntityFrameworkCore.Triggered.Analyzers.Core</PackageId>
710
</PropertyGroup>
811

912
<ItemGroup>

‎EntityFrameworkCore.Triggered.Core.slnf‎

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

‎EntityFrameworkCore.Triggered.Samples.slnf‎

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

0 commit comments

Comments
 (0)