Remove .NET 7 build target and update dependencies. (#52)

philliphoff · web-flow · commit ddba8197c78e · 2024-10-19T22:34:34.000-07:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -54,20 +54,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: ['6.0','7.0','8.0']
+        dotnet-version: ['6.0','8.0']
         include:
         - dotnet-version: '6.0'
           install-3: false
           display-name: '.NET 6.0'
           framework: 'net6.0'
           prefix: 'net6'
           install-version: '6.0.x'
-        - dotnet-version: '7.0'
-          install-3: false
-          display-name: '.NET 7.0'
-          framework: 'net7.0'
-          prefix: 'net7'
-          install-version: '7.0.x'
         - dotnet-version: '8.0'
           install-3: false
           display-name: '.NET 8.0'
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Azure.Storage.Queues" Version="12.20.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
+    <PackageVersion Include="Discord.Net" Version="3.16.0" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageVersion Include="Google.Api.CommonProtos" Version="2.16.0" />
+    <PackageVersion Include="Google.Protobuf" Version="3.28.2" />
+    <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.66.0" />
+    <PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="2.66.0" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.66.0" />
+    <PackageVersion Include="Grpc.Tools" Version="2.67.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="MinVer" Version="6.0.0" />
+    <PackageVersion Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
+    <PackageVersion Include="NSubstitute" Version="5.1.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+  </ItemGroup>
+</Project>
diff --git a/NuGet.Config b/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This SDK provides a better interface to create Pluggable Components without worr
 
 ## Prerequisites
 
-- [.NET 6 SDK](https://dotnet.microsoft.com/) or later
+- [.NET 6 or .NET 8 SDK](https://dotnet.microsoft.com/)
 - [Dapr](https://dapr.io/)
 
   ### SDK and Dapr Compatibility
@@ -15,6 +15,7 @@ This SDK provides a better interface to create Pluggable Components without worr
   |-------------|--------------------------|-------|
   | v0.1.x | v1.10 | Using SDK with Dapr v1.9 will not have ETag error handling. |
   | v0.2.x | v1.11 | Dapr state store API changes require use of the 0.2.0 SDK. |
+  | v0.3.x | v1.14 | |
 
 ## Implementing a Pluggable Component
 
diff --git a/samples/AzureStorageQueuesPubSubSample/AzureStorageQueuesPubSubSample.csproj b/samples/AzureStorageQueuesPubSubSample/AzureStorageQueuesPubSubSample.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="Azure.Storage.Queues" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 </Project>
diff --git a/samples/DiscordBindingSample/DiscordBindingSample.csproj b/samples/DiscordBindingSample/DiscordBindingSample.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
-    <PackageReference Include="Discord.Net" Version="3.9.0" />
+    <PackageReference Include="Azure.Storage.Queues" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="Discord.Net" />
   </ItemGroup>
 </Project>
diff --git a/src/Dapr.PluggableComponents.AspNetCore/Dapr.PluggableComponents.AspNetCore.csproj b/src/Dapr.PluggableComponents.AspNetCore/Dapr.PluggableComponents.AspNetCore.csproj
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.50.0" />
-    <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.50.0" />
-    <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
+    <PackageReference Include="Grpc.AspNetCore.Server" />
+    <PackageReference Include="Grpc.AspNetCore.Server.Reflection" />
+    <PackageReference Include="Mono.Unix" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Dapr.PluggableComponents.Protos/Dapr.PluggableComponents.Protos.csproj b/src/Dapr.PluggableComponents.Protos/Dapr.PluggableComponents.Protos.csproj
@@ -26,10 +26,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Api.CommonProtos" Version="2.13.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.60.0">
+    <PackageReference Include="Google.Api.CommonProtos" />
+    <PackageReference Include="Google.Protobuf" />
+    <PackageReference Include="Grpc.Net.Client" />
+    <PackageReference Include="Grpc.Tools">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Dapr.PluggableComponents.Tests/Dapr.PluggableComponents.Tests.csproj b/src/Dapr.PluggableComponents.Tests/Dapr.PluggableComponents.Tests.csproj
@@ -10,26 +10,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+    <PackageReference Include="coverlet.msbuild">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="NSubstitute" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <!-- Used to annotate PR with test failures: https://github.com/Tyrrrz/GitHubActionsTestLogger -->
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.1.2" />
+    <PackageReference Include="GitHubActionsTestLogger" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Dapr.PluggableComponents.Tests/DaprPluggableComponentsApplicationTests.cs b/src/Dapr.PluggableComponents.Tests/DaprPluggableComponentsApplicationTests.cs
@@ -48,15 +48,20 @@ public async Task RunAsyncWithCancellation()
     }
 
     [Fact(Timeout = TimeoutInMs)]
-    public void Run()
+    public async Task Run()
     {
         var application = DaprPluggableComponentsApplication.Create();
 
-        Task.Delay(TimeSpan.FromSeconds(1))
-            .ContinueWith(task => application.StopAsync())
-            .Unwrap()
-            .ContinueWith(task => Assert.Fail("Unable to stop application."), TaskContinuationOptions.OnlyOnFaulted);
+        var runTask = Task.Run(
+            () =>
+            {
+                application.Run();
+            });
+
+        await Task.Delay(TimeSpan.FromSeconds(1));
+
+        await application.StopAsync();
 
-        application.Run();
+        await runTask;
     }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -48,7 +48,7 @@
 
   <!-- Use MinVer for assembly, nuget versioning based on git tags -->
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="4.2.0">
+    <PackageReference Include="MinVer">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -57,7 +57,7 @@
   <!-- Configure properties for MinVer -->
   <PropertyGroup>
     <MinVerTagPrefix>v</MinVerTagPrefix>
-    <MinVerDefaultPreReleasePhase>rc</MinVerDefaultPreReleasePhase>
+    <MinVerDefaultPreReleaseIdentifiers>rc.0</MinVerDefaultPreReleaseIdentifiers>
     <!-- <MinVerVerbosity>detailed</MinVerVerbosity>-->
   </PropertyGroup>
 
@@ -67,7 +67,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
   </ItemGroup>
 
   <!-- Enable Deterministic Builds for github actions -->

Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,20 @@ public async Task RunAsyncWithCancellation()`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`[Fact(Timeout = TimeoutInMs)]`
`51`		`- public void Run()`
	`51`	`+ public async Task Run()`
`52`	`52`	`{`
`53`	`53`	`var application = DaprPluggableComponentsApplication.Create();`
`54`	`54`
`55`		`- Task.Delay(TimeSpan.FromSeconds(1))`
`56`		`- .ContinueWith(task => application.StopAsync())`
`57`		`- .Unwrap()`
`58`		`- .ContinueWith(task => Assert.Fail("Unable to stop application."), TaskContinuationOptions.OnlyOnFaulted);`
	`55`	`+ var runTask = Task.Run(`
	`56`	`+ () =>`
	`57`	`+ {`
	`58`	`+ application.Run();`
	`59`	`+ });`
	`60`	`+`
	`61`	`+ await Task.Delay(TimeSpan.FromSeconds(1));`
	`62`	`+`
	`63`	`+ await application.StopAsync();`
`59`	`64`
`60`		`- application.Run();`
	`65`	`+ await runTask;`
`61`	`66`	`}`
`62`	`67`	`}`