diff --git a/src/TemplateEngine/.editorconfig b/src/TemplateEngine/.editorconfig
index 6302ad145f70..ecfc8ffc6a4b 100644
--- a/src/TemplateEngine/.editorconfig
+++ b/src/TemplateEngine/.editorconfig
@@ -6,6 +6,8 @@
 # flagged as unnecessary for netcoreapp TFMs.
 dotnet_diagnostic.IDE0005.severity = suggestion
 
+dotnet_diagnostic.RS0041.severity = suggestion
+
 dotnet_diagnostic.SA0001.severity = none
 dotnet_diagnostic.SA1005.severity = none
 dotnet_diagnostic.SA1101.severity = none
diff --git a/src/TemplateEngine/Directory.Build.props b/src/TemplateEngine/Directory.Build.props
index c492ef908413..7a627e178396 100644
--- a/src/TemplateEngine/Directory.Build.props
+++ b/src/TemplateEngine/Directory.Build.props
@@ -6,11 +6,7 @@
     TemplateEngine-specific build properties.
   -->
   <PropertyGroup>
-    <!--
-      TODO: Update PublicAPI.Shipped/Unshipped.txt files to fix RS0016/RS0041 violations, then remove the suppression. 
-      https://github.com/dotnet/templating/issues/10085
-    -->
-    <NoWarn>$(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649;RS0016;RS0041</NoWarn>
+    <NoWarn>$(NoWarn);NU5105;NU5128;NU5100;NU5118;0419;0649</NoWarn>
 
     <!--
       TemplateEngine projects target netstandard2.0 and pin NuGet packages to an older
diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Abstractions/PublicAPI.Unshipped.txt b/src/TemplateEngine/Microsoft.TemplateEngine.Abstractions/PublicAPI.Unshipped.txt
index c5812ae7b1b7..0881d665603c 100644
--- a/src/TemplateEngine/Microsoft.TemplateEngine.Abstractions/PublicAPI.Unshipped.txt
+++ b/src/TemplateEngine/Microsoft.TemplateEngine.Abstractions/PublicAPI.Unshipped.txt
@@ -6,10 +6,17 @@ Microsoft.TemplateEngine.Abstractions.Installer.UpdateResult.Vulnerabilities.get
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.AdvisoryUris.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.AdvisoryUris.init -> void
+Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.Deconstruct(out int Severity, out System.Collections.Generic.IReadOnlyList<string!>! AdvisoryUris) -> void
+Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.Equals(Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo other) -> bool
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.Severity.get -> int
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.Severity.init -> void
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.VulnerabilityInfo() -> void
 Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.VulnerabilityInfo(int Severity, System.Collections.Generic.IReadOnlyList<string!>! AdvisoryUris) -> void
+override Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.GetHashCode() -> int
+~override Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.Equals(object obj) -> bool
+~override Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.ToString() -> string
+static Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.operator !=(Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo left, Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo right) -> bool
+static Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo.operator ==(Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo left, Microsoft.TemplateEngine.Abstractions.Installer.VulnerabilityInfo right) -> bool
 Microsoft.TemplateEngine.Abstractions.ITemplate.Localization.get -> Microsoft.TemplateEngine.Abstractions.ILocalizationLocator?
 Microsoft.TemplateEngine.Abstractions.ITemplate.TemplateSourceRoot.get -> Microsoft.TemplateEngine.Abstractions.Mount.IDirectory!
 Microsoft.TemplateEngine.Abstractions.ITemplateMetadata.PreferDefaultName.get -> bool
diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Shipped.txt b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Shipped.txt
index ad54f300c420..910f0be5db84 100644
--- a/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Shipped.txt
+++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Shipped.txt
@@ -33,7 +33,9 @@ Microsoft.TemplateEngine.Core.Contracts.IValueReadEventArgs
 Microsoft.TemplateEngine.Core.Contracts.IVariableConfig
 Microsoft.TemplateEngine.Core.Contracts.IVariableConfig.Expand.get -> bool
 Microsoft.TemplateEngine.Core.Contracts.KeysChangedEventHander
+virtual Microsoft.TemplateEngine.Core.Contracts.KeysChangedEventHander.Invoke(object! sender, Microsoft.TemplateEngine.Core.Contracts.IKeysChangedEventArgs! args) -> void
 Microsoft.TemplateEngine.Core.Contracts.ValueReadEventHander
+virtual Microsoft.TemplateEngine.Core.Contracts.ValueReadEventHander.Invoke(object! sender, Microsoft.TemplateEngine.Core.Contracts.IValueReadEventArgs! args) -> void
 Microsoft.TemplateEngine.Core.Contracts.IEncodingConfig.Encoding.get -> System.Text.Encoding!
 Microsoft.TemplateEngine.Core.Contracts.IEncodingConfig.LineEndings.get -> Microsoft.TemplateEngine.Core.Contracts.ITokenTrie!
 Microsoft.TemplateEngine.Core.Contracts.IEncodingConfig.this[int index].get -> object!
diff --git a/src/TemplateEngine/Microsoft.TemplateEngine.Core/PublicAPI.Shipped.txt b/src/TemplateEngine/Microsoft.TemplateEngine.Core/PublicAPI.Shipped.txt
index e660de105413..de3a9573f61f 100644
--- a/src/TemplateEngine/Microsoft.TemplateEngine.Core/PublicAPI.Shipped.txt
+++ b/src/TemplateEngine/Microsoft.TemplateEngine.Core/PublicAPI.Shipped.txt
@@ -119,6 +119,7 @@ Microsoft.TemplateEngine.Core.Expressions.TokenScope<TToken>.IsIndivisible.get -
 Microsoft.TemplateEngine.Core.Expressions.TokenScope<TToken>.IsQuoted.get -> bool
 Microsoft.TemplateEngine.Core.Expressions.TokenScope<TToken>.IsQuoted.set -> void
 Microsoft.TemplateEngine.Core.Expressions.TypeConverterDelegate<T>
+virtual Microsoft.TemplateEngine.Core.Expressions.TypeConverterDelegate<T>.Invoke(object? source, out T result) -> bool
 Microsoft.TemplateEngine.Core.Expressions.UnaryScope<TOperator>
 Microsoft.TemplateEngine.Core.Expressions.UnaryScope<TOperator>.IsFull.get -> bool
 Microsoft.TemplateEngine.Core.Expressions.UnaryScope<TOperator>.IsIndivisible.get -> bool
@@ -188,6 +189,7 @@ Microsoft.TemplateEngine.Core.Operations.Conditional.WholeLine.get -> bool
 Microsoft.TemplateEngine.Core.Operations.ConditionalTokens
 Microsoft.TemplateEngine.Core.Operations.ConditionalTokens.ConditionalTokens() -> void
 Microsoft.TemplateEngine.Core.Operations.ConditionEvaluator
+virtual Microsoft.TemplateEngine.Core.Operations.ConditionEvaluator.Invoke(Microsoft.TemplateEngine.Core.Contracts.IProcessorState! processor, ref int bufferLength, ref int currentBufferPosition, out bool faulted) -> bool
 Microsoft.TemplateEngine.Core.Operations.ExpandVariables
 Microsoft.TemplateEngine.Core.Operations.Include
 Microsoft.TemplateEngine.Core.Operations.InlineMarkupConditional
diff --git a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/PublicAPI.Unshipped.txt b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/PublicAPI.Unshipped.txt
index 7295788b12f7..5490499d3123 100644
--- a/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/PublicAPI.Unshipped.txt
+++ b/src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/PublicAPI.Unshipped.txt
@@ -4,11 +4,13 @@ Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands.IInstantiationResul
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands.IInstantiationResult.StdErr.get -> string!
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands.IInstantiationResult.StdOut.get -> string!
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands.RunInstantiation
+virtual Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands.RunInstantiation.Invoke(Microsoft.TemplateEngine.Authoring.TemplateVerifier.TemplateVerifierOptions! options) -> System.Threading.Tasks.Task<Microsoft.TemplateEngine.Authoring.TemplateVerifier.Commands.IInstantiationResult!>!
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.AddScrubber(Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.ScrubFileByPath! fileScrubber) -> Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition!
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.AddScrubber(System.Action<System.Text.StringBuilder!>! scrubber, string? extension = null) -> Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition!
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.ScrubbersDefinition(System.Action<System.Text.StringBuilder!>! scrubber, string? extension = null) -> void
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.ScrubFileByPath
+virtual Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.ScrubFileByPath.Invoke(string! relativeFilePath, System.Text.StringBuilder! content) -> void
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.TemplateVerificationErrorCode
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.TemplateVerificationErrorCode.InstallFailed = 106 -> Microsoft.TemplateEngine.Authoring.TemplateVerifier.TemplateVerificationErrorCode
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.TemplateVerificationErrorCode.InstantiationFailed = 100 -> Microsoft.TemplateEngine.Authoring.TemplateVerifier.TemplateVerificationErrorCode
@@ -87,4 +89,5 @@ Microsoft.TemplateEngine.Authoring.TemplateVerifier.VerificationEngine.Execute(M
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.VerificationEngine.VerificationEngine(Microsoft.Extensions.Logging.ILogger! logger) -> void
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.VerificationEngine.VerificationEngine(Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
 Microsoft.TemplateEngine.Authoring.TemplateVerifier.VerifyDirectory
+virtual Microsoft.TemplateEngine.Authoring.TemplateVerifier.VerifyDirectory.Invoke(string! contentDirectory, System.Lazy<System.Collections.Generic.IAsyncEnumerable<(string! FilePath, string! ScrubbedContent)>!>! contentFetcher) -> System.Threading.Tasks.Task!
 static readonly Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition.Empty -> Microsoft.TemplateEngine.Authoring.TemplateVerifier.ScrubbersDefinition!
\ No newline at end of file