Update .NET SDK to 8.0.100-preview.7.23376.3 (#843)

* Update .NET SDK Update .NET SDK to version 8.0.100-preview.7.23376.3. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <[email protected]> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 8.0.100-preview.7.23376.3 SDK. Bumps Microsoft.Extensions.DependencyInjection from 8.0.0-preview.6.23329.7 to 8.0.0-preview.7.23375.6. Bumps Microsoft.Extensions.Http from 8.0.0-preview.6.23329.7 to 8.0.0-preview.7.23375.6. Bumps Microsoft.Extensions.Http.Polly from 8.0.0-preview.6.23329.11 to 8.0.0-preview.7.23375.9. Bumps Microsoft.Extensions.Logging from 8.0.0-preview.6.23329.7 to 8.0.0-preview.7.23375.6. Bumps System.Text.Json from 8.0.0-preview.6.23329.7 to 8.0.0-preview.7.23375.6. --- updated-dependencies: - dependency-name: Microsoft.Extensions.DependencyInjection dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Http dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Http.Polly dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging dependency-type: direct:production update-type: version-update:semver-major - dependency-name: System.Text.Json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <[email protected]> * Fix build Use `CompositeFormat` to fix analyser warning. --------- Signed-off-by: costellobot <[email protected]> Co-authored-by: martincostello <[email protected]>
martincostello · Sep 8, 2023 · d8b419c · d8b419c
1 parent 88ecd81
commit d8b419c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -13,10 +13,10 @@
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
     <PackageVersion Include="MartinCostello.Testing.AwsLambdaTestServer" Version="0.7.1" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.6.23329.7" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0-preview.6.23329.7" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.0-preview.6.23329.11" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0-preview.6.23329.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.7.23375.6" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0-preview.7.23375.6" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.0-preview.7.23375.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0-preview.7.23375.6" />
     <!--
       HACK Workaround for https://github.com/aws/aws-lambda-dotnet/issues/920
     -->
@@ -27,7 +27,7 @@
     <PackageVersion Include="ReportGenerator" Version="5.1.25" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.0-preview.6.23329.7" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.0-preview.7.23375.6" />
     <PackageVersion Include="xunit" Version="2.5.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.6.23330.14",
+    "version": "8.0.100-preview.7.23376.3",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

diff --git a/src/LondonTravel.Skill/Intents/CommuteIntent.cs b/src/LondonTravel.Skill/Intents/CommuteIntent.cs
@@ -15,6 +15,8 @@ namespace MartinCostello.LondonTravel.Skill.Intents;
 /// </summary>
 internal sealed class CommuteIntent : IIntent
 {
+    private static readonly CompositeFormat CommuteIntentPrefixFormat = CompositeFormat.Parse(Strings.CommuteIntentPrefixFormat);
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CommuteIntent"/> class.
     /// </summary>
@@ -96,7 +98,7 @@ private async Task<SkillResponse> CommuteAsync(ICollection<string> favoriteLines
             if (hasMultipleStatuses)
             {
                 string displayName = Verbalizer.LineName(line.Name, asTitleCase: true);
-                text = string.Format(CultureInfo.CurrentCulture, Strings.CommuteIntentPrefixFormat, displayName, text);
+                text = string.Format(CultureInfo.CurrentCulture, CommuteIntentPrefixFormat, displayName, text);
             }
 
             paragraphs.Add(text);

diff --git a/src/LondonTravel.Skill/Lines.cs b/src/LondonTravel.Skill/Lines.cs
@@ -8,6 +8,8 @@ namespace MartinCostello.LondonTravel.Skill;
 /// </summary>
 internal static class Lines
 {
+    private static readonly CompositeFormat StatusIntentCardTitleFormat = CompositeFormat.Parse(Strings.StatusIntentCardTitleFormat);
+
     /// <summary>
     /// Returns whether the specified line name refers to the Docklands Light Railway.
     /// </summary>
@@ -148,6 +150,6 @@ public static string ToCardTitle(string name)
             suffix = Strings.LineSuffixUpper;
         }
 
-        return string.Format(CultureInfo.CurrentCulture, Strings.StatusIntentCardTitleFormat, name, suffix);
+        return string.Format(CultureInfo.CurrentCulture, StatusIntentCardTitleFormat, name, suffix);
     }
 }
diff --git a/src/LondonTravel.Skill/Verbalizer.cs b/src/LondonTravel.Skill/Verbalizer.cs
@@ -8,6 +8,9 @@ namespace MartinCostello.LondonTravel.Skill;
 /// </summary>
 internal static class Verbalizer
 {
+    private static readonly CompositeFormat LineNameWithoutPrefixFormat = CompositeFormat.Parse(Strings.LineNameWithoutPrefixFormat);
+    private static readonly CompositeFormat LineNameWithPrefixFormat = CompositeFormat.Parse(Strings.LineNameWithPrefixFormat);
+
     /// <summary>
     /// Returns the spoken version of the specified line name.
     /// </summary>
@@ -49,8 +52,8 @@ internal static string LineName(string name, bool asTitleCase = false)
 
         return
             asTitleCase ?
-            string.Format(CultureInfo.CurrentCulture, Strings.LineNameWithoutPrefixFormat, spokenName, suffix) :
-            string.Format(CultureInfo.CurrentCulture, Strings.LineNameWithPrefixFormat, prefix, spokenName, suffix);
+            string.Format(CultureInfo.CurrentCulture, LineNameWithoutPrefixFormat, spokenName, suffix) :
+            string.Format(CultureInfo.CurrentCulture, LineNameWithPrefixFormat, prefix, spokenName, suffix);
     }
 
     /// <summary>