Upgrade 'VB Hello World' sample (#8137)

dotnet · Nov 11, 2022 · debf291 · debf291
1 parent cd9f905
commit debf291
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/samples/VBHelloWorld/HelloWorld/HelloWorld.csproj b/samples/VBHelloWorld/HelloWorld/HelloWorld.csproj
@@ -1,21 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\VBGrains\VBGrains.vbproj" />
     <ProjectReference Include="..\Interfaces\Interfaces.vbproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.4.2" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.2" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/VBHelloWorld/HelloWorld/Program.cs b/samples/VBHelloWorld/HelloWorld/Program.cs
@@ -3,28 +3,26 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Orleans;
-using Orleans.CodeGeneration;
 using Orleans.Hosting;
 using VBGrains;
 
-[assembly: KnownAssembly(typeof(HelloGrain))]
-[assembly: KnownAssembly(typeof(IHelloGrain))]
+[assembly: GenerateCodeForDeclaringAssembly(typeof(HelloGrain))]
+[assembly: GenerateCodeForDeclaringAssembly(typeof(IHelloGrain))]
 
 using var host = new HostBuilder()
     .UseOrleans(builder =>
     {
         builder.UseLocalhostClustering();
     })
+    .UseConsoleLifetime()
     .Build();
 
 await host.StartAsync();
 
 var grainFactory = host.Services.GetRequiredService<IGrainFactory>();
 var friend = grainFactory.GetGrain<IHelloGrain>(0);
-Console.WriteLine("\n\n{0}\n\n", friend.SayHello("Good morning!").Result);
+Console.WriteLine("\n\n{0}\n\n", await friend.SayHello("Good morning!"));
 
 Console.WriteLine("Orleans is running.\nPress Enter to terminate...");
 Console.ReadLine();
 Console.WriteLine("Orleans is stopping...");
-
-await host.StopAsync();
diff --git a/samples/VBHelloWorld/Interfaces/Interfaces.vbproj b/samples/VBHelloWorld/Interfaces/Interfaces.vbproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.4.2" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="7.0.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/VBHelloWorld/VBGrains/VBGrains.vbproj b/samples/VBHelloWorld/VBGrains/VBGrains.vbproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Interfaces\Interfaces.vbproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.4.2" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="7.0.0" />
   </ItemGroup>
 </Project>