Merge pull request #759 from microsoft/metadataUpdate

Update metadata to 37.0.34-preview
microsoft · Nov 10, 2022 · 874445e · 874445e
2 parents b9ba086 + 6de6ebe
commit 874445e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -39,7 +39,7 @@
     <IncludeSymbols Condition=" '$(DebugType)' != 'embedded' ">true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
-    <MetadataVersion>36.0.9-preview</MetadataVersion>
+    <MetadataVersion>37.0.34-preview</MetadataVersion>
     <!-- <DiaMetadataVersion>0.2.185-preview-g7e1e6a442c</DiaMetadataVersion> -->
     <ApiDocsVersion>0.1.7-alpha</ApiDocsVersion>
   </PropertyGroup>

diff --git a/src/Microsoft.Windows.CsWin32/Generator.cs b/src/Microsoft.Windows.CsWin32/Generator.cs
@@ -3784,6 +3784,8 @@ private TypeDeclarationSyntax DeclareInterfaceAsStruct(TypeDefinitionHandle type
                     bool preserveSig = interfaceAsSubtype
                         || !IsHresult(signature.ReturnType)
                         || (methodDefinition.ImplAttributes & MethodImplAttributes.PreserveSig) == MethodImplAttributes.PreserveSig
+                        || this.FindInteropDecorativeAttribute(methodDefinition.GetCustomAttributes(), "CanReturnMultipleSuccessValuesAttribute") is not null
+                        || this.FindInteropDecorativeAttribute(methodDefinition.GetCustomAttributes(), "CanReturnErrorsAsSuccessAttribute") is not null
                         || this.options.ComInterop.PreserveSigMethods.Contains($"{ifaceName}.{methodName}")
                         || this.options.ComInterop.PreserveSigMethods.Contains(ifaceName.ToString());
 

diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -1353,7 +1353,6 @@ public void NoFriendlyOverloadsWithSpanInNet35(bool allowMarshaling)
         Assert.True(this.generator.TryGenerate("EvtNext", CancellationToken.None));
         this.CollectGeneratedCode(this.generator);
         this.AssertNoDiagnostics();
-        Assert.Single(this.FindGeneratedMethod("EvtNext"));
     }
 
     [Theory, PairwiseData]