Move to central package management (#283)

Also: Make tests run serially to improve reliability
microsoft · Jan 23, 2025 · 7fb737a · 7fb737a
1 parent ee4a99c
commit 7fb737a
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 23 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git a/src/DurableTask.SqlServer.AzureFunctions/DurableTask.SqlServer.AzureFunctions.csproj b/src/DurableTask.SqlServer.AzureFunctions/DurableTask.SqlServer.AzureFunctions.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DurableTask.SqlServer/DurableTask.SqlServer.csproj b/src/DurableTask.SqlServer/DurableTask.SqlServer.csproj
@@ -21,10 +21,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.*" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.1.5" />
-    <PackageReference Include="SemanticVersion" Version="2.1.0" />
-    <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
+    <PackageReference Include="Microsoft.Azure.DurableTask.Core" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
+    <PackageReference Include="SemanticVersion" />
+    <PackageReference Include="System.Threading.Channels" />
   </ItemGroup>
 
 </Project>
diff --git a/...Extensions.DurableTask.SqlServer/Functions.Worker.Extensions.DurableTask.SqlServer.csproj b/...Extensions.DurableTask.SqlServer/Functions.Worker.Extensions.DurableTask.SqlServer.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.3.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" />
   </ItemGroup>
 
   <!-- This tells the .NET Isolated Worker SDK which WebJobs extension this package depends on -->

diff --git a/src/common.props b/src/common.props
@@ -38,7 +38,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.*" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/DurableTask.SqlServer.AzureFunctions.Tests/CoreScenarios.cs b/test/DurableTask.SqlServer.AzureFunctions.Tests/CoreScenarios.cs
@@ -15,7 +15,7 @@ namespace DurableTask.SqlServer.AzureFunctions.Tests
     using Xunit;
     using Xunit.Abstractions;
 
-    [Collection("CoreScenarios")]
+    [Collection("Integration")]
     public class CoreScenarios : IntegrationTestBase
     {
         protected CoreScenarios(ITestOutputHelper output, string taskHubName, bool multiTenancy)

diff --git a/...ableTask.SqlServer.AzureFunctions.Tests/DurableTask.SqlServer.AzureFunctions.Tests.csproj b/...ableTask.SqlServer.AzureFunctions.Tests/DurableTask.SqlServer.AzureFunctions.Tests.csproj
@@ -13,9 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="xunit" Version="2.5.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs b/test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs
@@ -167,7 +167,6 @@ protected async Task<DurableOrchestrationStatus> StartOrchestrationAsync(
             return status;
         }
 
-
         protected async Task StartOrchestrationWithoutWaitingAsync(
             string name,
             object? input = null,
@@ -177,9 +176,9 @@ protected async Task StartOrchestrationWithoutWaitingAsync(
             IDurableClient client = this.GetDurableClient(taskHub ?? this.taskHubName);
             instanceId = await client.StartNewAsync(name, instanceId ?? Guid.NewGuid().ToString("N"), input);
 
-
             Assert.NotNull(instanceId);
         }
+
         protected async Task<DurableOrchestrationStatus> RewindOrchestrationAsync(string instanceId)
         {
             IDurableClient client = this.GetDurableClient();

diff --git a/test/DurableTask.SqlServer.AzureFunctions.Tests/WithoutMultiTenancyCoreScenarios.cs b/test/DurableTask.SqlServer.AzureFunctions.Tests/WithoutMultiTenancyCoreScenarios.cs
@@ -9,6 +9,7 @@ namespace DurableTask.SqlServer.AzureFunctions.Tests
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class WithoutMultiTenancyCoreScenarios : CoreScenarios
     {
         public WithoutMultiTenancyCoreScenarios(ITestOutputHelper output)

diff --git a/test/DurableTask.SqlServer.Tests/DurableTask.SqlServer.Tests.csproj b/test/DurableTask.SqlServer.Tests/DurableTask.SqlServer.Tests.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.EventSource" Version="6.0.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.8.0" />
-    <PackageReference Include="Moq" Version="4.16.*" />
-    <PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.6.0" />
-    <PackageReference Include="xunit" Version="2.5.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.EventSource" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/DurableTask.SqlServer.Tests/Integration/DataRetentionTests.cs b/test/DurableTask.SqlServer.Tests/Integration/DataRetentionTests.cs
@@ -18,6 +18,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class DataRetentionTests : IAsyncLifetime
     {
         readonly TestService testService;

diff --git a/test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs b/test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs
@@ -21,6 +21,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class DatabaseManagement
     {
         readonly TestLogProvider logProvider;

diff --git a/test/DurableTask.SqlServer.Tests/Integration/FaultTesting.cs b/test/DurableTask.SqlServer.Tests/Integration/FaultTesting.cs
@@ -14,6 +14,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class FaultTesting : IAsyncLifetime
     {
         readonly TestService testService;

diff --git a/test/DurableTask.SqlServer.Tests/Integration/LegacyErrorPropagation.cs b/test/DurableTask.SqlServer.Tests/Integration/LegacyErrorPropagation.cs
@@ -12,6 +12,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class LegacyErrorPropagation : IAsyncLifetime
     {
         readonly TestService testService;

diff --git a/test/DurableTask.SqlServer.Tests/Integration/Orchestrations.cs b/test/DurableTask.SqlServer.Tests/Integration/Orchestrations.cs
@@ -22,6 +22,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class Orchestrations : IAsyncLifetime
     {
         readonly TestService testService;

diff --git a/test/DurableTask.SqlServer.Tests/Integration/ScaleTests.cs b/test/DurableTask.SqlServer.Tests/Integration/ScaleTests.cs
@@ -16,6 +16,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Integration")]
     public class ScaleTests : IAsyncLifetime
     {
         readonly TestService testService;

diff --git a/test/DurableTask.SqlServer.Tests/Integration/StressTests.cs b/test/DurableTask.SqlServer.Tests/Integration/StressTests.cs
@@ -17,6 +17,7 @@ namespace DurableTask.SqlServer.Tests.Integration
     /// tests and therefore may not be appropriate for all CI or rapid testing scenarios.
     /// </summary>
     [Trait("Category", "Stress")]
+    [Collection("Integration")]
     public class StressTests : IAsyncLifetime
     {
         readonly TestService testService;

diff --git a/test/PerformanceTests/PerformanceTests.csproj b/test/PerformanceTests/PerformanceTests.csproj
@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.*" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\DurableTask.SqlServer.AzureFunctions\DurableTask.SqlServer.AzureFunctions.csproj" />

diff --git a/tools/TestDBGenerator/TestDBGenerator.csproj b/tools/TestDBGenerator/TestDBGenerator.csproj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <!-- Change this version to create databases with different versions -->
-    <PackageReference Include="Microsoft.DurableTask.SqlServer" Version="1.0.0" />
+    <PackageReference Include="Microsoft.DurableTask.SqlServer" VersionOverride="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.8.0" />
+    <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
   </ItemGroup>
 
 </Project>