OrleansContrib · Kritner · Dec 16, 2022 · Dec 9, 2022 · Dec 9, 2022 · Dec 9, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dotnet-format tool
       run: dotnet tool install -g dotnet-format
@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       run: dotnet restore

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dotnet-format tool
       run: dotnet tool install -g dotnet-format
@@ -43,7 +43,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       run: dotnet restore
@@ -58,4 +58,4 @@ jobs:
       run: dotnet pack src/Orleans.SyncWork/Orleans.SyncWork.csproj -c Release --no-restore --no-build --include-symbols -p:SymbolPackageFormat=snupkg -o .
 
     - name: Push to NuGet
-      run: dotnet nuget push *.nupkg --skip-duplicate -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
+      run: dotnet nuget push *.nupkg --skip-duplicate -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,10 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: |
-          3.1.x
-          5.0.x
-          6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       run: dotnet restore
@@ -36,4 +33,4 @@ jobs:
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: ./test/Orleans.SyncWork.Tests/TestResults/coverage.info
+        path-to-lcov: ./test/Orleans.SyncWork.Tests/TestResults/coverage.info
diff --git a/samples/Orleans.SyncWork.Demo.Api.Benchmark/BenchmarkingSiloHost.cs b/samples/Orleans.SyncWork.Demo.Api.Benchmark/BenchmarkingSiloHost.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-using Orleans.Hosting;
-using Orleans.SyncWork.Tests.TestClusters;
+using Orleans.SyncWork.Tests.TestClusters;
 using Orleans.TestingHost;
 
 namespace Orleans.SyncWork.Demo.Api.Benchmark;

diff --git a/samples/Orleans.SyncWork.Demo.Api.Benchmark/Orleans.SyncWork.Demo.Api.Benchmark.csproj b/samples/Orleans.SyncWork.Demo.Api.Benchmark/Orleans.SyncWork.Demo.Api.Benchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/samples/Orleans.SyncWork.Demo.Api/Orleans.SyncWork.Demo.Api.csproj b/samples/Orleans.SyncWork.Demo.Api/Orleans.SyncWork.Demo.Api.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Server" Version="3.5.1" />
-    <PackageReference Include="OrleansDashboard" Version="3.6.1" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
+    <PackageReference Include="OrleansDashboard" Version="7.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

diff --git a/samples/Orleans.SyncWork.Demo.Api/OrleansConfigurationHelper.cs b/samples/Orleans.SyncWork.Demo.Api/OrleansConfigurationHelper.cs
@@ -30,8 +30,6 @@ public static ConfigureHostBuilder ConfigureOrleans(this ConfigureHostBuilder bu
                         options.ServiceId = "HelloWorldApp";
                     })
                     .Configure<EndpointOptions>(options => options.AdvertisedIPAddress = IPAddress.Loopback)
-                    .ConfigureApplicationParts(parts =>
-                        parts.AddApplicationPart(typeof(IHelloWorld).Assembly).WithReferences())
                     .ConfigureSyncWorkAbstraction(maxSyncWorkConcurrency)
                     .ConfigureLogging(logging => logging.AddConsole())
                     .ConfigureServices(collection =>

diff --git a/samples/Orleans.SyncWork.Demo.Services/Grains/PasswordVerifier.cs b/samples/Orleans.SyncWork.Demo.Services/Grains/PasswordVerifier.cs
@@ -25,13 +25,19 @@ protected override async Task<PasswordVerifierResult> PerformWork(PasswordVerifi
         };
     }
 }
+
+[GenerateSerializer]
 public class PasswordVerifierRequest
 {
+    [Id(0)]
     public string Password { get; set; }
+    [Id(1)]
     public string PasswordHash { get; set; }
 }
 
+[GenerateSerializer]
 public class PasswordVerifierResult
 {
+    [Id(0)]
     public bool IsValid { get; set; }
 }
diff --git a/samples/Orleans.SyncWork.Demo.Services/Orleans.SyncWork.Demo.Services.csproj b/samples/Orleans.SyncWork.Demo.Services/Orleans.SyncWork.Demo.Services.csproj
@@ -1,18 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+    <LangVersion>11</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.2" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/....Demo.Services/TestGrains/GrainThatWaitsSetTimePriorToExceptionResultBecomingAvailable.cs b/....Demo.Services/TestGrains/GrainThatWaitsSetTimePriorToExceptionResultBecomingAvailable.cs
@@ -4,16 +4,20 @@
 
 namespace Orleans.SyncWork.Demo.Services.TestGrains;
 
+[GenerateSerializer]
 public class TestGrainException : Exception
 {
     public TestGrainException(string message) : base(message) { }
 }
 
+[GenerateSerializer]
 public class TestDelayExceptionRequest
 {
+    [Id(0)]
     public int MsDelayPriorToResult { get; set; }
 }
 
+[GenerateSerializer]
 public class TestDelayExceptionResult
 {
 }

diff --git a/...rk.Demo.Services/TestGrains/GrainThatWaitsSetTimePriorToSuccessResultBecomingAvailable.cs b/...rk.Demo.Services/TestGrains/GrainThatWaitsSetTimePriorToSuccessResultBecomingAvailable.cs
@@ -4,15 +4,21 @@
 
 namespace Orleans.SyncWork.Demo.Services.TestGrains;
 
+[GenerateSerializer]
 public class TestDelaySuccessRequest
 {
+    [Id(0)]
     public DateTime Started { get; set; }
+    [Id(1)]
     public int MsDelayPriorToResult { get; set; }
 }
 
+[GenerateSerializer]
 public class TestDelaySuccessResult
 {
+    [Id(0)]
     public DateTime Started { get; set; }
+    [Id(1)]
     public DateTime Ended { get; set; }
 }
 

diff --git a/src/Orleans.SyncWork/Exceptions/InvalidStateException.cs b/src/Orleans.SyncWork/Exceptions/InvalidStateException.cs
@@ -8,6 +8,7 @@ namespace Orleans.SyncWork.Exceptions;
 /// from the <see cref="ISyncWorker{TRequest, TResult}"/>, when the grain
 /// is not in a valid state to return the requested data.
 /// </summary>
+[GenerateSerializer]
 public class InvalidStateException : Exception
 {
     /// <summary>

diff --git a/src/Orleans.SyncWork/ExtensionMethods/ClientBuilderExtensions.cs b/src/Orleans.SyncWork/ExtensionMethods/ClientBuilderExtensions.cs
diff --git a/src/Orleans.SyncWork/ExtensionMethods/SiloBuilderExtensions.cs b/src/Orleans.SyncWork/ExtensionMethods/SiloBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Orleans.SyncWork.ExtensionMethods;
 public static class SiloBuilderExtensions
 {
     /// <summary>
-    /// Configures assembly scanning against this assembly containing the <see cref="ISyncWorker{TRequest, TResult}"/>.
+    /// Adds <see cref="LimitedConcurrencyLevelTaskScheduler"/> to service provider.
     /// </summary>
     /// <param name="builder">The <see cref="ISiloBuilder"/> instance.</param>
     /// <param name="maxSyncWorkConcurrency">
@@ -24,8 +24,6 @@ public static class SiloBuilderExtensions
     /// <returns>The <see cref="ISiloBuilder"/> to allow additional fluent API chaining.</returns>
     public static ISiloBuilder ConfigureSyncWorkAbstraction(this ISiloBuilder builder, int maxSyncWorkConcurrency = 4)
     {
-        builder.ConfigureApplicationParts(parts => parts.AddApplicationPart(typeof(ISyncWorkAbstractionMarker).Assembly).WithReferences());
-
         builder.ConfigureServices(services =>
         {
             services.AddSingleton(_ => new LimitedConcurrencyLevelTaskScheduler(maxSyncWorkConcurrency));

diff --git a/src/Orleans.SyncWork/ExtensionMethods/SiloHostBuilderExtensions.cs b/src/Orleans.SyncWork/ExtensionMethods/SiloHostBuilderExtensions.cs
diff --git a/src/Orleans.SyncWork/Orleans.SyncWork.csproj b/src/Orleans.SyncWork/Orleans.SyncWork.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+    <LangVersion>11</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -32,14 +32,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/test/Orleans.SyncWork.Tests/ExtensionMethods/ClientBuilderExtensionsTests.cs b/test/Orleans.SyncWork.Tests/ExtensionMethods/ClientBuilderExtensionsTests.cs