Skip to content

Commit 29260b4

Browse files
committed
Use a better way of refing the build project
1 parent 63848d6 commit 29260b4

9 files changed

Lines changed: 7 additions & 20 deletions

File tree

.github/workflows/CI.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ jobs:
3131
6.0.x
3232
8.0.x
3333
10.0.x
34-
- name: .NET Build (eng prebuild)
35-
run: dotnet build eng/StackExchange.Redis.Build/StackExchange.Redis.Build.csproj -c Release /p:CI=true
3634
- name: .NET Build
3735
run: dotnet build Build.csproj -c Release /p:CI=true
3836
- name: StackExchange.Redis.Tests
@@ -134,8 +132,6 @@ jobs:
134132
redis-cli -p 26381 INFO SERVER | grep redis_version || echo "Failed to get version for port 26381"
135133
continue-on-error: true
136134

137-
- name: .NET Build (eng prebuild)
138-
run: dotnet build eng/StackExchange.Redis.Build/StackExchange.Redis.Build.csproj -c Release /p:CI=true
139135
- name: .NET Build
140136
run: dotnet build Build.csproj -c Release /p:CI=true
141137
- name: StackExchange.Redis.Tests

.github/workflows/codeql.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ jobs:
5353
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5454
# queries: security-extended,security-and-quality
5555

56-
- if: matrix.language == 'csharp'
57-
name: .NET Build (eng prebuild)
58-
run: dotnet build eng/StackExchange.Redis.Build/StackExchange.Redis.Build.csproj -c Release /p:CI=true
59-
6056
- if: matrix.language == 'csharp'
6157
name: .NET Build
6258
run: dotnet build Build.csproj -c Release /p:CI=true

Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,11 @@
4242
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
4343
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
4444
</ItemGroup>
45+
46+
<ItemGroup>
47+
<!-- for everything except the build project itself: use the build project as an analyzer -->
48+
<ProjectReference Condition="'$(AssemblyName)' != 'StackExchange.Redis.Build'"
49+
Include="..\..\eng\StackExchange.Redis.Build\StackExchange.Redis.Build.csproj"
50+
OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
51+
</ItemGroup>
4552
</Project>

src/Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@
1111
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
1212
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" Condition=" '$(DEVCONTAINER)' != 'true' " />
1313
</ItemGroup>
14-
<ItemGroup>
15-
<Analyzer Include="..\..\eng\StackExchange.Redis.Build\bin\$(Configuration)\netstandard2.0\StackExchange.Redis.Build.dll" />
16-
</ItemGroup>
1714
</Project>

src/RESPite/RESPite.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<ItemGroup>
2020
<InternalsVisibleTo Include="RESPite.Tests"/>
2121
<None Include="readme.md" Pack="true" PackagePath="/"/>
22-
<None Include="../../eng/StackExchange.Redis.Build/bin/$(Configuration)/netstandard2.0/StackExchange.Redis.Build.dll" Pack="true" PackagePath="analyzers/dotnet" Visible="true"
23-
Link="Shared/StackExchange.Redis.Build.dll"/>
2422
</ItemGroup>
2523

2624
<ItemGroup>

src/StackExchange.Redis/StackExchange.Redis.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
<InternalsVisibleTo Include="StackExchange.Redis.Tests" />
5555
</ItemGroup>
5656

57-
<ItemGroup>
58-
<ProjectReference Include="..\..\eng\StackExchange.Redis.Build\StackExchange.Redis.Build.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
59-
</ItemGroup>
60-
6157
<ItemGroup>
6258
<!-- before v3, we don't have an actual reference to RESPite, so let's share the minimal files -->
6359
<Compile Include="..\RESPite\Shared\AsciiHash.cs" Link="Shared\AsciiHash.cs" />

tests/StackExchange.Redis.Benchmarks/StackExchange.Redis.Benchmarks.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
<ProjectReference Include="..\..\src\RESPite\RESPite.csproj" />
1414
<!-- removing this for now, due to conflicting AsciiHash -->
1515
<!-- <ProjectReference Include="..\..\src\StackExchange.Redis\StackExchange.Redis.csproj" /> -->
16-
<ProjectReference Include="..\..\eng\StackExchange.Redis.Build\StackExchange.Redis.Build.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
1716
</ItemGroup>
1817
</Project>

tests/StackExchange.Redis.Tests/StackExchange.Redis.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,5 @@
3333
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
3434
<PackageReference Include="System.IO.Compression" />
3535
<PackageReference Include="System.IO.Pipelines" />
36-
<ProjectReference Include="..\..\eng\StackExchange.Redis.Build\StackExchange.Redis.Build.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
3736
</ItemGroup>
3837
</Project>

toys/StackExchange.Redis.Server/StackExchange.Redis.Server.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
<ProjectReference Include="..\..\src\StackExchange.Redis\StackExchange.Redis.csproj" Aliases="seredis"/>
1616
<ProjectReference Include="..\..\src\RESPite\RESPite.csproj" />
1717
<PackageReference Include="System.Runtime.Caching" />
18-
<ProjectReference Include="..\..\eng\StackExchange.Redis.Build\StackExchange.Redis.Build.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
1918
</ItemGroup>
2019
</Project>

0 commit comments

Comments
 (0)