Skip to content

Commit 55481a3

Browse files
nytiannytian
authored
Move to Central Package Management (#373)
* initial commit * udpate by comment * upgrade durabletask.sidecar to v1.1.2 * fix typo * udpate with comments * add samples cpm file * udpate sample test to pass CI
1 parent ccf9bee commit 55481a3

35 files changed

+196
-94
lines changed

‎Directory.Packages.props‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!--
4+
More information about central package management:
5+
https://learn.microsoft.com/nuget/consume-packages/central-package-management
6+
-->
7+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
8+
</PropertyGroup>
9+
10+
<!-- Microsoft.Extensions.* Packages -->
11+
<ItemGroup>
12+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
13+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net48'" />
16+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'"/>
17+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
19+
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.1" />
21+
</ItemGroup>
22+
23+
<!-- Azure.* Packages -->
24+
<ItemGroup>
25+
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
26+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.21.0" />
27+
</ItemGroup>
28+
29+
<!-- DurableTask Packages -->
30+
<ItemGroup>
31+
<PackageVersion Include="Microsoft.Azure.DurableTask.Core" Version="3.0.0" />
32+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.2.2" />
33+
<PackageVersion Include="Microsoft.DurableTask.Sidecar" Version="1.1.2" />
34+
</ItemGroup>
35+
36+
<!-- Grpc / Protobuf Packages -->
37+
<ItemGroup>
38+
<PackageVersion Include="Google.Protobuf" Version="3.21.12" />
39+
<PackageVersion Include="Grpc.Core" Version="2.46.5" />
40+
<PackageVersion Include="Grpc.Net.Client" Version="2.67.0" />
41+
<PackageVersion Include="Grpc.Tools" Version="2.51.0" />
42+
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.52.0" />
43+
</ItemGroup>
44+
45+
<!-- Microsoft.CodeAnalysis.* Packages -->
46+
<ItemGroup>
47+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.9.2" />
48+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
49+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
50+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
51+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
52+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
53+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
54+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
55+
<PackageVersion Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.24165.2" />
56+
</ItemGroup>
57+
58+
<!-- Testing Frameworks & Analysis Packages -->
59+
<ItemGroup>
60+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
61+
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
62+
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.17.2"/>
63+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
64+
<PackageVersion Include="Moq" Version="4.20.70" />
65+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
66+
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
67+
<PackageVersion Include="xunit" Version="2.5.3" />
68+
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
69+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3"/>
70+
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
71+
</ItemGroup>
72+
73+
<!-- Base-class library dependencies -->
74+
<ItemGroup>
75+
<PackageVersion Include="DotNext" Version="4.13.1" />
76+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
77+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
78+
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
79+
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
80+
</ItemGroup>
81+
82+
</Project>

‎nuget.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear/>
5-
<add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
6-
<add key="AzureFunctionsTempStaging" value="https://pkgs.dev.azure.com/azfunc/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
75
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
86
</packageSources>
97
</configuration>

‎samples/AzureFunctionsApp/AzureFunctionsApp.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.20.0" />
12-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.0" />
13-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
14-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.2" OutputItemType="Analyzer" />
15-
<PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
11+
<PackageReference Include="Microsoft.Azure.Functions.Worker" />
12+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" />
13+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" />
14+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" OutputItemType="Analyzer" />
15+
<PackageReference Include="Microsoft.DurableTask.Generators" OutputItemType="Analyzer" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎samples/AzureFunctionsUnitTests/AzureFunctionsApp.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="xunit" Version="2.5.3" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
17-
<PackageReference Include="moq" Version="4.20.70" />
13+
<PackageReference Include="coverlet.collector" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
15+
<PackageReference Include="xunit" />
16+
<PackageReference Include="xunit.runner.visualstudio" />
17+
<PackageReference Include="Moq" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎samples/AzureFunctionsUnitTests/SampleUnitTests.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public async Task OrchestrationReturnsMultipleGreetings()
3333
Mock<ILoggerFactory> loggerFactoryMock = new();
3434
loggerFactoryMock.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(logger);
3535
contextMock.Protected().Setup<ILoggerFactory>("LoggerFactory").Returns(loggerFactoryMock.Object);
36+
contextMock.Setup(x => x.CreateReplaySafeLogger(It.IsAny<string>()))
37+
.Returns((string categoryName) => loggerFactoryMock.Object.CreateLogger(categoryName));
38+
3639

3740
// mock activity results
3841
// In Moq, optional arguments need to be specified as well. We specify them with It.IsAny<T>(), where T is the type of the optional argument
@@ -144,10 +147,10 @@ public async Task ClientReturnsUrls()
144147

145148
// Validate format of response URLs
146149
Assert.NotNull(keyValuePairs);
147-
Assert.Contains(keyValuePairs, kvp => kvp.Key == "id" && kvp.Value == instanceId);
148-
Assert.Contains(keyValuePairs, kvp => kvp.Key == "purgeHistoryDeleteUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}");
149-
Assert.Contains(keyValuePairs, kvp => kvp.Key == "sendEventPostUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}/raiseEvent/{{eventName}}");
150-
Assert.Contains(keyValuePairs, kvp => kvp.Key == "statusQueryGetUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}");
150+
Assert.Contains(keyValuePairs, kvp => kvp.Key == "Id" && kvp.Value == instanceId);
151+
Assert.Contains(keyValuePairs, kvp => kvp.Key == "PurgeHistoryDeleteUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}");
152+
Assert.Contains(keyValuePairs, kvp => kvp.Key == "SendEventPostUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}/raiseEvent/{{eventName}}");
153+
Assert.Contains(keyValuePairs, kvp => kvp.Key == "StatusQueryGetUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}");
151154

152155
}
153156

‎samples/ConsoleApp/ConsoleApp.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting" />
1111

1212
<!-- Real projects would use package references -->
1313
<!--

‎samples/ConsoleAppMinimal/ConsoleAppMinimal.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting" />
1111

1212
<!-- Real projects would use package references -->
1313
<!--

‎samples/Directory.Packages.props‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
3+
4+
<!-- Functions sample packages -->
5+
<ItemGroup>
6+
<PackageVersion Update="coverlet.collector" Version="6.0.0" />
7+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
8+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.2" />
9+
</ItemGroup>
10+
11+
<!-- Durable sample packages -->
12+
<ItemGroup>
13+
<PackageVersion Include="Microsoft.DurableTask.Client.Grpc" Version="1.5.0" />
14+
<PackageVersion Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" />
15+
<PackageVersion Include="Microsoft.DurableTask.Worker.Grpc" Version="1.5.0" />
16+
</ItemGroup>
17+
18+
</Project>

‎samples/NetFxConsoleApp/NetFxConsoleApp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
10-
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.1.0" />
11-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.1.0" />
9+
<PackageReference Include="Microsoft.Extensions.Hosting" />
10+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" />
11+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" />
1212
</ItemGroup>
1313

1414
</Project>

‎samples/WebAPI/WebAPI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.1.0" />
13-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.1.0" />
14-
<PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
12+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" />
13+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" />
14+
<PackageReference Include="Microsoft.DurableTask.Generators" OutputItemType="Analyzer" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)