[modelsrepository] Dependency update (System.Text.Encodings.Web) and error msg change. (Azure#25115)

* Covers dependency update and error msg change.
* Adds comment explaining explicit reference.

Author: digimaun

sdk/modelsrepository/Azure.IoT.ModelsRepository/src/Azure.IoT.ModelsRepository.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyTitle>Azure IoT Models Repository SDK</AssemblyTitle>
@@ -18,6 +18,10 @@
   <ItemGroup>
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="System.Text.Json" />
+    <!-- The explicit package reference is required to pull a version >4.6.0 which contains a vulnerability.
+         Not versioning will use the version defined in eng/Packages.Data.props.
+         System.Text.Encodings.Web is a dependency for System.Text.Json -->
+    <PackageReference Include="System.Text.Encodings.Web" />
   </ItemGroup>
 
   <!-- Common source from Azure.Core -->

sdk/modelsrepository/Azure.IoT.ModelsRepository/src/ModelsRepositoryEventSource.cs

@@ -25,7 +25,7 @@ internal sealed class ModelsRepositoryEventSource : AzureEventSource
         private const int FailureProcessingRepositoryMetadataEventId = 3001;
         private const int InvalidDtmiInputEventId = 4000;
         private const int ErrorFetchingModelContentEventId = 4004;
-        private const int IncorrectDtmiCasingEventId = 4006;
+        private const int IncorrectDtmiEventId = 4006;
 
         public static ModelsRepositoryEventSource Instance { get; } = new ModelsRepositoryEventSource();
 
@@ -79,12 +79,12 @@ public void DiscoveredDependencies(string dependencies)
             }
         }
 
-        [Event(IncorrectDtmiCasingEventId, Level = EventLevel.Error, Message = StandardStrings.IncorrectDtmiCasing)]
-        public void IncorrectDtmiCasing(string expected, string parsed)
+        [Event(IncorrectDtmiEventId, Level = EventLevel.Error, Message = StandardStrings.IncorrectDtmi)]
+        public void IncorrectDtmi(string expected, string parsed)
         {
             if (IsEnabled(EventLevel.Error, EventKeywords.None))
             {
-                WriteEvent(IncorrectDtmiCasingEventId, expected, parsed);
+                WriteEvent(IncorrectDtmiEventId, expected, parsed);
             }
         }
 

sdk/modelsrepository/Azure.IoT.ModelsRepository/src/RepositoryHandler.cs

@@ -134,10 +134,10 @@ private async Task<ModelResult> ProcessAsync(
                 string parsedDtmi = metadata.Id;
                 if (!parsedDtmi.Equals(targetDtmi, StringComparison.Ordinal))
                 {
-                    ModelsRepositoryEventSource.Instance.IncorrectDtmiCasing(targetDtmi, parsedDtmi);
+                    ModelsRepositoryEventSource.Instance.IncorrectDtmi(targetDtmi, parsedDtmi);
                     string formatErrorMsg =
                         $"{string.Format(CultureInfo.InvariantCulture, StandardStrings.GenericGetModelsError, targetDtmi)} " +
-                        string.Format(CultureInfo.InvariantCulture, StandardStrings.IncorrectDtmiCasing, targetDtmi, parsedDtmi);
+                        string.Format(CultureInfo.InvariantCulture, StandardStrings.IncorrectDtmi, targetDtmi, parsedDtmi);
 
                     throw new RequestFailedException(formatErrorMsg, new FormatException(formatErrorMsg));
                 }

sdk/modelsrepository/Azure.IoT.ModelsRepository/src/StandardStrings.cs

@@ -14,7 +14,7 @@ internal class StandardStrings
         public const string FetchingModelContent = "Attempting to fetch model content from \"{0}\".";
         public const string ErrorFetchingModelContent = "Model file \"{0}\" not found or not accessible in target repository.";
         public const string FailureProcessingRepositoryMetadata = "Unable to fetch or process repository metadata file.";
-        public const string IncorrectDtmiCasing =
-            "Fetched model has incorrect DTMI casing. Expected \"{0}\", parsed \"{1}\".";
+        public const string IncorrectDtmi =
+            "Fetched model has an incorrect DTMI. Expected \"{0}\", parsed \"{1}\".";
     }
 }

sdk/modelsrepository/Azure.IoT.ModelsRepository/tests/GetModelIntegrationTests.cs

@@ -25,7 +25,7 @@ public void GetModelWrongDtmiCasingThrowsException(ModelsRepositoryTestBase.Clie
             string expectedExMsg =
                 string.Format(StandardStrings.GenericGetModelsError, "dtmi:com:example:thermostat;1") +
                 " " +
-                string.Format(StandardStrings.IncorrectDtmiCasing, "dtmi:com:example:thermostat;1", "dtmi:com:example:Thermostat;1");
+                string.Format(StandardStrings.IncorrectDtmi, "dtmi:com:example:thermostat;1", "dtmi:com:example:Thermostat;1");
 
             Func<Task> act = async () => await client.GetModelAsync(dtmi);
             act.Should().Throw<RequestFailedException>().WithMessage(expectedExMsg);