From ff56b4f9b33655dd689b3b8c1822d74f49c36d0e Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 30 Apr 2026 09:57:47 -0500 Subject: [PATCH 1/4] Update to Aspire 13.3 Also bump versions of other packages to latest. --- Directory.Packages.props | 26 +++---- aspire.config.json | 5 ++ nuget.config | 10 ++- src/Catalog.API/Catalog.API.json | 78 ++++++++++++------- src/Catalog.API/Catalog.API_v2.json | 60 +++++++++----- src/eShop.AppHost/eShop.AppHost.csproj | 2 +- .../Catalog.FunctionalTests.csproj | 2 +- .../Ordering.FunctionalTests.csproj | 2 +- 8 files changed, 121 insertions(+), 64 deletions(-) create mode 100644 aspire.config.json diff --git a/Directory.Packages.props b/Directory.Packages.props index d05d03343..8bcf441d1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,13 +2,13 @@ true true - 10.0.5 - 10.4.0 - 13.2.0 - 13.2.0-preview.1.26170.3 + 10.0.7 + 10.5.0 + 13.3.0 + 13.3.0-preview.1.26229.6 2.76.0 7.3.1 - 10.0.0-preview.2 + 10.0.0 @@ -26,7 +26,7 @@ - + @@ -60,15 +60,15 @@ - - + + - - - - - + + + + + diff --git a/aspire.config.json b/aspire.config.json new file mode 100644 index 000000000..88ec9e43e --- /dev/null +++ b/aspire.config.json @@ -0,0 +1,5 @@ +{ + "appHost": { + "path": "src/eShop.AppHost/eShop.AppHost.csproj" + } +} \ No newline at end of file diff --git a/nuget.config b/nuget.config index 15a0ec276..857a80374 100644 --- a/nuget.config +++ b/nuget.config @@ -4,13 +4,19 @@ + - + + + - + + + + \ No newline at end of file diff --git a/src/Catalog.API/Catalog.API.json b/src/Catalog.API/Catalog.API.json index 558048a09..12eb08818 100644 --- a/src/Catalog.API/Catalog.API.json +++ b/src/Catalog.API/Catalog.API.json @@ -38,8 +38,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -96,8 +98,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -152,8 +156,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -193,8 +199,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -285,8 +293,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -332,8 +342,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -379,8 +391,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -452,8 +466,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -494,8 +510,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -589,8 +607,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -671,8 +691,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -771,8 +793,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], @@ -857,8 +881,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "1.0" + "enum": [ + "1.0" + ], + "type": "string" } } ], diff --git a/src/Catalog.API/Catalog.API_v2.json b/src/Catalog.API/Catalog.API_v2.json index 3750990af..1f1ae7f5a 100644 --- a/src/Catalog.API/Catalog.API_v2.json +++ b/src/Catalog.API/Catalog.API_v2.json @@ -38,8 +38,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -96,8 +98,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -152,8 +156,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -191,8 +197,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -259,8 +267,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -351,8 +361,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -398,8 +410,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -445,8 +459,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -552,8 +568,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], @@ -634,8 +652,10 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "type": "string", - "example": "2.0" + "enum": [ + "2.0" + ], + "type": "string" } } ], diff --git a/src/eShop.AppHost/eShop.AppHost.csproj b/src/eShop.AppHost/eShop.AppHost.csproj index 34c3e3864..8acb19a24 100644 --- a/src/eShop.AppHost/eShop.AppHost.csproj +++ b/src/eShop.AppHost/eShop.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj index bc101f0cf..7ad146379 100644 --- a/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj +++ b/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + net10.0 diff --git a/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj index 68f53ed29..1a5e61d7b 100644 --- a/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj +++ b/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + net10.0 From 26ef2ce9965d1405739dcc9ef3a4074a9c2f1db1 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 May 2026 09:44:42 -0500 Subject: [PATCH 2/4] PR feedback --- .aspire/settings.json | 3 -- Directory.Packages.props | 4 +- nuget.config | 10 +--- src/Catalog.API/Catalog.API.json | 78 ++++++++++------------------- src/Catalog.API/Catalog.API_v2.json | 60 ++++++++-------------- 5 files changed, 50 insertions(+), 105 deletions(-) delete mode 100644 .aspire/settings.json diff --git a/.aspire/settings.json b/.aspire/settings.json deleted file mode 100644 index ba179b4ae..000000000 --- a/.aspire/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "appHostPath": "../src/eShop.AppHost/eShop.AppHost.csproj" -} \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 8bcf441d1..696244417 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,7 +8,7 @@ 13.3.0-preview.1.26229.6 2.76.0 7.3.1 - 10.0.0 + 10.0.0-preview.2 @@ -26,7 +26,7 @@ - + diff --git a/nuget.config b/nuget.config index 857a80374..15a0ec276 100644 --- a/nuget.config +++ b/nuget.config @@ -4,19 +4,13 @@ - + - - - - - - - \ No newline at end of file + diff --git a/src/Catalog.API/Catalog.API.json b/src/Catalog.API/Catalog.API.json index 12eb08818..558048a09 100644 --- a/src/Catalog.API/Catalog.API.json +++ b/src/Catalog.API/Catalog.API.json @@ -38,10 +38,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -98,10 +96,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -156,10 +152,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -199,10 +193,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -293,10 +285,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -342,10 +332,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -391,10 +379,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -466,10 +452,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -510,10 +494,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -607,10 +589,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -691,10 +671,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -793,10 +771,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], @@ -881,10 +857,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "1.0" - ], - "type": "string" + "type": "string", + "example": "1.0" } } ], diff --git a/src/Catalog.API/Catalog.API_v2.json b/src/Catalog.API/Catalog.API_v2.json index 1f1ae7f5a..3750990af 100644 --- a/src/Catalog.API/Catalog.API_v2.json +++ b/src/Catalog.API/Catalog.API_v2.json @@ -38,10 +38,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -98,10 +96,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -156,10 +152,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -197,10 +191,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -267,10 +259,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -361,10 +351,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -410,10 +398,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -459,10 +445,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -568,10 +552,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], @@ -652,10 +634,8 @@ "description": "The API version, in the format 'major.minor'.", "required": true, "schema": { - "enum": [ - "2.0" - ], - "type": "string" + "type": "string", + "example": "2.0" } } ], From 0bd14a53ba0c73f8dfd39766007ce72989f0c9f7 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 May 2026 09:49:05 -0500 Subject: [PATCH 3/4] Update OLTP --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 696244417..f42bbdfc8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -63,7 +63,7 @@ - + From 657c01ad013e5a78d2e79a9b77582eb05c4b1672 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 May 2026 09:52:13 -0500 Subject: [PATCH 4/4] Update unstable package version --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f42bbdfc8..b253caa12 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ 10.0.7 10.5.0 13.3.0 - 13.3.0-preview.1.26229.6 + 13.3.0-preview.1.26256.5 2.76.0 7.3.1 10.0.0-preview.2