Merge pull request #538 from microsoft/updates

Update metadata to 23.0.2-preview
microsoft · May 6, 2022 · f69cde9 · f69cde9
2 parents 898c26e + a6fde4f
commit f69cde9
Show file tree

Hide file tree

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

diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
@@ -21,11 +21,11 @@ steps:
   enabled: false # https://github.com/dotnet/sdk/issues/14578
 
 - task: DotNetCoreCLI@2
-  displayName: 🧪 dotnet test -f net5.0
+  displayName: 🧪 dotnet test -f net6.0
   inputs:
     command: test
-    arguments: --no-build -c $(BuildConfiguration) -f net5.0 --filter "TestCategory!=FailsInCloudTest$(TestFilter)" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net5.0.binlog"
-    testRunTitle: net5.0-$(Agent.JobName)
+    arguments: --no-build -c $(BuildConfiguration) -f net6.0 --filter "TestCategory!=FailsInCloudTest$(TestFilter)" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net6.0.binlog"
+    testRunTitle: net6.0-$(Agent.JobName)
   condition: succeededOrFailed()
 
 - task: DotNetCoreCLI@2

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "6.0.200",
     "rollForward": "patch",
     "allowPrerelease": false
   }

diff --git a/src/Microsoft.Windows.CsWin32/Generator.cs b/src/Microsoft.Windows.CsWin32/Generator.cs
@@ -2186,7 +2186,7 @@ private static ObjectCreationExpressionSyntax GuidValue(CustomAttribute guidAttr
                 Argument(LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(ToHex(k), k))));
         }
 
-        private static ObjectCreationExpressionSyntax PropertyKeyValue(CustomAttribute propertyKeyAttribute)
+        private static ObjectCreationExpressionSyntax PropertyKeyValue(CustomAttribute propertyKeyAttribute, TypeSyntax type)
         {
             CustomAttributeValue<TypeSyntax> args = propertyKeyAttribute.DecodeValue(CustomAttributeTypeProvider.Instance);
             var a = (uint)args.FixedArguments[0].Value!;
@@ -2202,7 +2202,7 @@ private static ObjectCreationExpressionSyntax PropertyKeyValue(CustomAttribute p
             var k = (byte)args.FixedArguments[10].Value!;
             var pid = (uint)args.FixedArguments[11].Value!;
 
-            return ObjectCreationExpression(IdentifierName("global::Windows.Win32.UI.Shell.PropertiesSystem.PROPERTYKEY")).WithInitializer(
+            return ObjectCreationExpression(type).WithInitializer(
                 InitializerExpression(SyntaxKind.ObjectInitializerExpression, SeparatedList<ExpressionSyntax>(new[]
                 {
                     AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, IdentifierName("fmtid"), GuidValue(propertyKeyAttribute)),
@@ -2878,7 +2878,7 @@ private FieldDeclarationSyntax DeclareConstant(FieldDefinitionHandle fieldDefHan
                 ExpressionSyntax value =
                     fieldDef.GetDefaultValue() is { IsNil: false } constantHandle ? this.ToExpressionSyntax(this.Reader.GetConstant(constantHandle)) :
                     this.FindInteropDecorativeAttribute(customAttributes, nameof(GuidAttribute)) is CustomAttribute guidAttribute ? GuidValue(guidAttribute) :
-                    this.FindInteropDecorativeAttribute(customAttributes, "PropertyKeyAttribute") is CustomAttribute propertyKeyAttribute ? PropertyKeyValue(propertyKeyAttribute) :
+                    this.FindInteropDecorativeAttribute(customAttributes, "PropertyKeyAttribute") is CustomAttribute propertyKeyAttribute ? PropertyKeyValue(propertyKeyAttribute, fieldType.Type) :
                     throw new NotSupportedException("Unsupported constant: " + name);
                 bool requiresUnsafe = false;
                 if (fieldType.Type is not PredefinedTypeSyntax && value is not ObjectCreationExpressionSyntax)

diff --git a/src/Win32MetaGeneration/Win32MetaGeneration.csproj b/src/Win32MetaGeneration/Win32MetaGeneration.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/test/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj b/test/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\src\Microsoft.Windows.CsWin32\build\Microsoft.Windows.CsWin32.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows7.0;netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows7.0;netcoreapp3.1;net472</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -236,7 +236,8 @@ public void InterestingAPIs(
             "JsVariantToValue",
             "D2D1_DEFAULT_FLATTENING_TOLERANCE", // a float constant
             "WIA_CATEGORY_FINISHED_FILE", // GUID constant
-            "DEVPKEY_MTPBTH_IsConnected", // PROPERTYKEY constant
+            "DEVPKEY_MTPBTH_IsConnected", // DEVPROPKEY constant
+            "PKEY_AudioEndpoint_FormFactor", // PROPERTYKEY constant
             "RT_CURSOR", // PCWSTR constant
             "IOleUILinkContainerW", // An IUnknown-derived interface with no GUID
             "RTM_ENTITY_EXPORT_METHODS",

diff --git a/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj b/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1;net472</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/test/SpellChecker/SpellChecker.csproj b/test/SpellChecker/SpellChecker.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0-windows7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows8.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/WinRTInteropTest/WinRTInteropTest.csproj b/test/WinRTInteropTest/WinRTInteropTest.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <Nullable>disable</Nullable>
   </PropertyGroup>