Skip to content

Commit 083a915

Browse files
nytiannytian
committed
Merge branch 'nytian/codeql' of https://github.com/microsoft/durabletask-dotnet into nytian/codeql
2 parents ff451b7 + e91ba8c commit 083a915

File tree

13 files changed

+44
-49
lines changed

13 files changed

+44
-49
lines changed

‎.github/workflows/validate-build.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@ on:
1414

1515
env:
1616
solution: Microsoft.DurableTask.sln
17-
config: Release
17+
config: release
1818

1919
jobs:
2020
build:
21-
runs-on: ubuntu-latest
21+
runs-on: windows-latest
2222

2323
steps:
2424
- uses: actions/checkout@v3
25-
with:
26-
submodules: true
2725

2826
- name: Setup .NET 6.0
2927
uses: actions/setup-dotnet@v3
@@ -36,16 +34,16 @@ jobs:
3634
global-json-file: global.json
3735

3836
- name: Restore dependencies
39-
run: dotnet restore $solution
37+
run: dotnet restore $env:solution
4038

4139
- name: Build
42-
run: dotnet build $solution --configuration $config --no-restore -p:FileVersionRevision=$GITHUB_RUN_NUMBER -p:ContinuousIntegrationBuild=true
40+
run: dotnet build $env:solution --configuration $env:config --no-restore -p:FileVersionRevision=$env:GITHUB_RUN_NUMBER
4341

4442
- name: Test
45-
run: dotnet test $solution --configuration $config --no-build --verbosity normal
43+
run: dotnet test $env:solution --configuration $env:config --no-build --verbosity normal
4644

4745
- name: Pack
48-
run: dotnet pack $solution --configuration $config --no-build
46+
run: dotnet pack $env:solution --configuration $env:config --no-build
4947

5048
- name: Upload
5149
uses: actions/upload-artifact@v4

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,9 @@
3636
<StrongNamePublicKey>00240000048000009400000006020000002400005253413100040000010001000505410141442095e0b0466df68ac32d158abdf0bd9cf26407d7a9d20b93656530556f23979f20b067628b9baee75fc6bba5c349519585a2852c1843bc61d74c4cbf9d80429cbdcbf609ea70fd62061eb65f40a6c9d505dd71cb119ef51f589a014d3b56159abbc38825fafbd119b6e97ebd9a5f3862a5c06220c680a6ac9eec</StrongNamePublicKey>
3737
</PropertyGroup>
3838

39+
<PropertyGroup Condition="'$(ContinuousIntegrationBuild)' == ''">
40+
<ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild> <!-- GitHub actions -->
41+
<ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild> <!-- Azure Devops -->
42+
</PropertyGroup>
43+
3944
</Project>

‎test/Abstractions.Tests/Abstractions.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
</PropertyGroup>
6+
37
<ItemGroup>
48
<ProjectReference Include="$(SrcRoot)Abstractions/Abstractions.csproj" />
59
</ItemGroup>

‎test/Analyzers.Tests/Analyzers.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
</PropertyGroup>
6+
37
<ItemGroup>
48
<PackageReference Include="Microsoft.CodeAnalysis" />
59
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />

‎test/Benchmarks/Benchmarks.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
45
<OutputType>Exe</OutputType>
56
<AssemblyName>Benchmarks</AssemblyName>
67
</PropertyGroup>

‎test/Client/Core.Tests/Client.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
</PropertyGroup>
6+
37
<ItemGroup>
48
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
59
</ItemGroup>

‎test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
</PropertyGroup>
6+
37
<ItemGroup>
48
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
59
</ItemGroup>

‎test/Client/OrchestrationServiceClientShim.Tests/ShimDurableEntityClientTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public async Task GetAllEntitiesAsync_NoFilter_ReturnsExpectedResult()
9595
Enumerable.Range(0, 25).Select(i => CreateCoreMetadata(i))];
9696

9797
string? continuationToken = null;
98-
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Batch(10))
98+
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Chunk(10))
9999
{
100100
EntityBackendQueries.EntityQuery filter = new()
101101
{
@@ -139,7 +139,7 @@ public async Task GetAllEntitiesAsync_WithFilter_ReturnsExpectedResult()
139139

140140
string? continuationToken = Guid.NewGuid().ToString();
141141
EntityQuery query = new() { IncludeState = false, PageSize = 10, ContinuationToken = continuationToken };
142-
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Batch(10))
142+
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Chunk(10))
143143
{
144144
EntityBackendQueries.EntityQuery filter = new()
145145
{
@@ -182,7 +182,7 @@ public async Task GetAllEntitiesAsyncOfT_NoFilter_ReturnsExpectedResult()
182182
Enumerable.Range(0, 25).Select(i => CreateCoreMetadata(i, $"state-{i}"))];
183183

184184
string? continuationToken = null;
185-
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Batch(10))
185+
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Chunk(10))
186186
{
187187
EntityBackendQueries.EntityQuery filter = new()
188188
{
@@ -226,7 +226,7 @@ public async Task GetAllEntitiesAsyncOfT_WithFilter_ReturnsExpectedResult()
226226

227227
string? continuationToken = Guid.NewGuid().ToString();
228228
EntityQuery query = new() { IncludeState = true, PageSize = 10, ContinuationToken = continuationToken };
229-
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Batch(10))
229+
foreach (IEnumerable<EntityBackendQueries.EntityMetadata> batch in entities.Chunk(10))
230230
{
231231
EntityBackendQueries.EntityQuery filter = new()
232232
{

‎test/Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<PropertyGroup>
1111
<IsPackable>false</IsPackable>
1212
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
13-
<TargetFramework>net6.0</TargetFramework>
1413
</PropertyGroup>
1514

1615
</Project>

‎test/Generators.Tests/Generators.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
</PropertyGroup>
6+
37
<ItemGroup>
48
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
59
</ItemGroup>

0 commit comments

Comments
 (0)