From cea079a8d289c6384c03a65a69f98cb0ac8510e9 Mon Sep 17 00:00:00 2001
From: Reuben Bond <203839+ReubenBond@users.noreply.github.com>
Date: Thu, 14 Nov 2024 08:04:26 -0800
Subject: [PATCH] Update for .NET 9.0 (#9232)
---
.azure/pipelines/build.yaml | 2 +-
.azure/pipelines/templates/build.yaml | 2 +-
Directory.Build.props | 4 +-
Directory.Packages.props | 102 +++++++++---------
.../ChaoticCluster.AppHost.csproj | 7 +-
.../ChaoticCluster.AppHost/Program.cs | 3 -
.../DashboardToy.AppHost.csproj | 6 +-
.../DashboardToy.AppHost/Program.cs | 5 +-
.../Orleans.Analyzers.csproj | 1 +
.../Orleans.CodeGenerator.csproj | 1 +
.../TestSerializerExternalModels.csproj | 1 +
11 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/.azure/pipelines/build.yaml b/.azure/pipelines/build.yaml
index de42b1cd7b..55be7545f7 100644
--- a/.azure/pipelines/build.yaml
+++ b/.azure/pipelines/build.yaml
@@ -26,7 +26,7 @@ parameters:
- name: version_prefix
displayName: Version prefix
type: string
- default: 8.0.0
+ default: 9.0.0
- name: include_suffix
displayName: Append version suffix
type: boolean
diff --git a/.azure/pipelines/templates/build.yaml b/.azure/pipelines/templates/build.yaml
index cf8adecba5..beeb1c62a4 100644
--- a/.azure/pipelines/templates/build.yaml
+++ b/.azure/pipelines/templates/build.yaml
@@ -9,7 +9,7 @@ parameters:
- name: version_prefix
displayName: Version prefix
type: string
- default: 8.0.0
+ default: 9.0.0
- name: include_suffix
displayName: Append version suffix
type: boolean
diff --git a/Directory.Build.props b/Directory.Build.props
index a3f6664d9a..2ccdfed7fe 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -50,8 +50,8 @@
- 8.0.0.0
- 8.0.0
+ 9.0.0.0
+ 9.0.0
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a084e077cc..9cf3408bba 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,6 +1,7 @@
true
+ true
2.5.3
2.4.2
@@ -9,15 +10,16 @@
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -25,38 +27,38 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -66,18 +68,18 @@
-
-
-
+
+
+
-
-
+
+
-
+
@@ -86,30 +88,30 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/playground/ChaoticCluster/ChaoticCluster.AppHost/ChaoticCluster.AppHost.csproj b/playground/ChaoticCluster/ChaoticCluster.AppHost/ChaoticCluster.AppHost.csproj
index 95ad36182c..fbdeb2d491 100644
--- a/playground/ChaoticCluster/ChaoticCluster.AppHost/ChaoticCluster.AppHost.csproj
+++ b/playground/ChaoticCluster/ChaoticCluster.AppHost/ChaoticCluster.AppHost.csproj
@@ -1,14 +1,13 @@
+
+
Exe
net8.0
enable
enable
-
-
-
-
+ true
8cceaca4-1c1f-473f-ac3a-6f220c8791cf
diff --git a/playground/ChaoticCluster/ChaoticCluster.AppHost/Program.cs b/playground/ChaoticCluster/ChaoticCluster.AppHost/Program.cs
index a3147fd1ec..cdabc2d9c9 100644
--- a/playground/ChaoticCluster/ChaoticCluster.AppHost/Program.cs
+++ b/playground/ChaoticCluster/ChaoticCluster.AppHost/Program.cs
@@ -2,9 +2,6 @@
var builder = DistributedApplication.CreateBuilder(args);
-/*
-// Comment this out once Aspire no longer requires a 'workload' to build.
builder.AddProject("silo");
-*/
builder.Build().Run();
diff --git a/playground/DashboardToy/DashboardToy.AppHost/DashboardToy.AppHost.csproj b/playground/DashboardToy/DashboardToy.AppHost/DashboardToy.AppHost.csproj
index b00b2d429c..aca1dfb739 100644
--- a/playground/DashboardToy/DashboardToy.AppHost/DashboardToy.AppHost.csproj
+++ b/playground/DashboardToy/DashboardToy.AppHost/DashboardToy.AppHost.csproj
@@ -1,13 +1,13 @@
+
+
Exe
net8.0
enable
enable
-
-
-
+ true
6a521b87-2bf9-4af8-b7c7-4947536e1d50
diff --git a/playground/DashboardToy/DashboardToy.AppHost/Program.cs b/playground/DashboardToy/DashboardToy.AppHost/Program.cs
index 22ba50d04b..74757403ee 100644
--- a/playground/DashboardToy/DashboardToy.AppHost/Program.cs
+++ b/playground/DashboardToy/DashboardToy.AppHost/Program.cs
@@ -1,16 +1,15 @@
using Projects;
var builder = DistributedApplication.CreateBuilder(args);
+
var redis = builder.AddRedis("orleans-redis");
var orleans = builder.AddOrleans("cluster")
.WithClustering(redis);
-/*
-// Comment this out once Aspire no longer requires a 'workload' to build.
builder.AddProject("frontend")
.WithReference(orleans)
+ .WaitFor(redis)
.WithReplicas(5);
-*/
builder.Build().Run();
diff --git a/src/Orleans.Analyzers/Orleans.Analyzers.csproj b/src/Orleans.Analyzers/Orleans.Analyzers.csproj
index 82a525bb1e..27dd05ce2c 100644
--- a/src/Orleans.Analyzers/Orleans.Analyzers.csproj
+++ b/src/Orleans.Analyzers/Orleans.Analyzers.csproj
@@ -9,6 +9,7 @@
true
false
true
+ $(NoWarn);RS1038
diff --git a/src/Orleans.CodeGenerator/Orleans.CodeGenerator.csproj b/src/Orleans.CodeGenerator/Orleans.CodeGenerator.csproj
index c05d097cd9..aab3e00487 100644
--- a/src/Orleans.CodeGenerator/Orleans.CodeGenerator.csproj
+++ b/src/Orleans.CodeGenerator/Orleans.CodeGenerator.csproj
@@ -11,6 +11,7 @@
false
true
true
+ $(NoWarn);RS1038
diff --git a/test/Misc/TestSerializerExternalModels/TestSerializerExternalModels.csproj b/test/Misc/TestSerializerExternalModels/TestSerializerExternalModels.csproj
index d83003b5bd..5c84c6d585 100644
--- a/test/Misc/TestSerializerExternalModels/TestSerializerExternalModels.csproj
+++ b/test/Misc/TestSerializerExternalModels/TestSerializerExternalModels.csproj
@@ -3,6 +3,7 @@
UnitTests.SerializerExternalModels
SerializerExternalModels
$(TestTargetFrameworks);netcoreapp3.1
+ true