FI: Main to develop

.github/workflows/Code-Scanning.yml

@@ -26,7 +26,7 @@ on:
 jobs:
   analyze:
     name: Analysis
-    runs-on: windows-latest
+    runs-on: windows-2025-vs2026
     permissions:
       actions: read
       contents: read

_wdk_utils/winget/configs/wdk-desktop.vsconfig

@@ -0,0 +1,27 @@
+{
+  "version": "1.0",
+  "components": [
+    "Component.Microsoft.Windows.DriverKit",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.VisualStudio.Component.CoreEditor",
+    "Microsoft.VisualStudio.Component.DiagnosticTools",
+    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+    "Microsoft.VisualStudio.Component.TextTemplating",
+    "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.ATL.Spectre",
+    "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre",
+    "Microsoft.VisualStudio.Component.VC.CoreIde",
+    "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
+    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
+    "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Workload.NativeDesktop"
+  ],
+  "extensions": []
+}

configuration.dsc.yaml → _wdk_utils/winget/configs/wdk-vscommunity.dsc.yaml

@@ -4,10 +4,10 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio 2022 Community
+        description: Install Visual Studio Community
         allowPrerelease: true
       settings:
-        id: Microsoft.VisualStudio.2022.Community
+        id: Microsoft.VisualStudio.Community
         source: winget
         useLatest: true
     - resource: Microsoft.VisualStudio.DSC/VSComponents
@@ -18,49 +18,48 @@ properties:
         description: Install required VS workloads and components
       settings:
         productId: Microsoft.VisualStudio.Product.Community
-        channelId: VisualStudio.17.Release
+        channelId: VisualStudio.18.Release
         includeRecommended: false
         components:
-          - Microsoft.VisualStudio.Component.VC.CoreBuildTools
-          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
-          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
-          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
-          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
-          - Microsoft.VisualStudio.Component.Windows10SDK
-          - Microsoft.VisualStudio.Component.VC.ATL
-          - Microsoft.VisualStudio.Component.VC.ATL.ARM64
-          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
+          - Component.Microsoft.Windows.DriverKit
+          - Microsoft.Component.MSBuild
+          - Microsoft.VisualStudio.Component.CoreEditor
+          - Microsoft.VisualStudio.Component.DiagnosticTools
+          - Microsoft.VisualStudio.Component.Roslyn.Compiler
+          - Microsoft.VisualStudio.Component.TextTemplating
           - Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.ATLMFC
+          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
           - Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre
-          - Microsoft.VisualStudio.Component.VC.ASAN
-          - Microsoft.VisualStudio.Component.NuGet.BuildTools
-          - Microsoft.VisualStudio.Component.VC.MFC.ARM64
+          - Microsoft.VisualStudio.Component.VC.CoreIde
           - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
+          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
+          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
+          - Microsoft.VisualStudio.Workload.CoreEditor
           - Microsoft.VisualStudio.Workload.NativeDesktop
-          - Component.Microsoft.Windows.DriverKit
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: sdkPackage
       directives:
-        description: Install Windows SDK version 26100
+        description: Install Windows SDK version 28000
         allowPrerelease: true
       settings:
-        id: Microsoft.WindowsSDK.10.0.26100
+        id: Microsoft.WindowsSDK.10.0.28000
         source: winget
         useLatest: true
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: wdkPackage
       dependsOn:
         - sdkPackage
       directives:
-        description: Install Windows Driver Kit version 26100
+        description: Install Windows Driver Kit version 28000
         allowPrerelease: true
       settings:
-        id: Microsoft.WindowsWDK.10.0.26100
+        id: Microsoft.WindowsWDK.10.0.28000
         source: winget
         useLatest: true
   configurationVersion: 0.2.1

configuration_vsonly.dsc.yaml → _wdk_utils/winget/configs/wdk-vsenterprise.dsc.yaml

@@ -4,10 +4,10 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio 2022 Community
+        description: Install Visual Studio Enterprise
         allowPrerelease: true
       settings:
-        id: Microsoft.VisualStudio.2022.Community
+        id: Microsoft.VisualStudio.Enterprise
         source: winget
         useLatest: true
     - resource: Microsoft.VisualStudio.DSC/VSComponents
@@ -17,30 +17,49 @@ properties:
       directives:
         description: Install required VS workloads and components
       settings:
-        productId: Microsoft.VisualStudio.Product.Community
-        channelId: VisualStudio.17.Release
+        productId: Microsoft.VisualStudio.Product.Enterprise
+        channelId: VisualStudio.18.Release
         includeRecommended: false
         components:
-          - Microsoft.VisualStudio.Component.VC.CoreBuildTools
-          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
-          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
-          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
-          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
-          - Microsoft.VisualStudio.Component.Windows10SDK
-          - Microsoft.VisualStudio.Component.VC.ATL
-          - Microsoft.VisualStudio.Component.VC.ATL.ARM64
-          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
+          - Component.Microsoft.Windows.DriverKit
+          - Microsoft.Component.MSBuild
+          - Microsoft.VisualStudio.Component.CoreEditor
+          - Microsoft.VisualStudio.Component.DiagnosticTools
+          - Microsoft.VisualStudio.Component.Roslyn.Compiler
+          - Microsoft.VisualStudio.Component.TextTemplating
           - Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.ATLMFC
+          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
           - Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre
-          - Microsoft.VisualStudio.Component.VC.ASAN
-          - Microsoft.VisualStudio.Component.NuGet.BuildTools
-          - Microsoft.VisualStudio.Component.VC.MFC.ARM64
+          - Microsoft.VisualStudio.Component.VC.CoreIde
           - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
+          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
+          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
+          - Microsoft.VisualStudio.Workload.CoreEditor
           - Microsoft.VisualStudio.Workload.NativeDesktop
-          - Component.Microsoft.Windows.DriverKit
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: sdkPackage
+      directives:
+        description: Install Windows SDK version 28000
+        allowPrerelease: true
+      settings:
+        id: Microsoft.WindowsSDK.10.0.28000
+        source: winget
+        useLatest: true
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: wdkPackage
+      dependsOn:
+        - sdkPackage
+      directives:
+        description: Install Windows Driver Kit version 28000
+        allowPrerelease: true
+      settings:
+        id: Microsoft.WindowsWDK.10.0.28000
+        source: winget
+        useLatest: true
   configurationVersion: 0.2.1

_wdk_utils/winget/configs/wdk-vsprofessional.dsc.yaml

@@ -0,0 +1,65 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: vsPackage
+      directives:
+        description: Install Visual Studio Professional
+        allowPrerelease: true
+      settings:
+        id: Microsoft.VisualStudio.Professional
+        source: winget
+        useLatest: true
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      id: vsComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads and components
+      settings:
+        productId: Microsoft.VisualStudio.Product.Professional
+        channelId: VisualStudio.18.Release
+        includeRecommended: false
+        components:
+          - Component.Microsoft.Windows.DriverKit
+          - Microsoft.Component.MSBuild
+          - Microsoft.VisualStudio.Component.CoreEditor
+          - Microsoft.VisualStudio.Component.DiagnosticTools
+          - Microsoft.VisualStudio.Component.Roslyn.Compiler
+          - Microsoft.VisualStudio.Component.TextTemplating
+          - Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
+          - Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre
+          - Microsoft.VisualStudio.Component.VC.CoreIde
+          - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
+          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
+          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
+          - Microsoft.VisualStudio.Workload.CoreEditor
+          - Microsoft.VisualStudio.Workload.NativeDesktop
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: sdkPackage
+      directives:
+        description: Install Windows SDK version 28000
+        allowPrerelease: true
+      settings:
+        id: Microsoft.WindowsSDK.10.0.28000
+        source: winget
+        useLatest: true
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: wdkPackage
+      dependsOn:
+        - sdkPackage
+      directives:
+        description: Install Windows Driver Kit version 28000
+        allowPrerelease: true
+      settings:
+        id: Microsoft.WindowsWDK.10.0.28000
+        source: winget
+        useLatest: true
+  configurationVersion: 0.2.1

exclusions.csv

@@ -10,4 +10,3 @@ general\pcidrv,*,26100,,"failure introduced in VS17.14, suppressed until fix"
 serial\serial,*,26100,,"failure introduced in VS17.14, suppressed until fix"
 network\wlan\wdi,*,26100,,"failure introduced in VS17.14, suppressed until fix"
 tools\kasan\samples\kasandemo-wdm,*|x64,26100,,"failure introduced in VS17.14, suppressed until fix"
-

general/SimpleMediaSource/MediaSource/MediaSource.vcxproj

@@ -22,7 +22,6 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{43AD9BF7-E765-48FE-9826-71A8F2CB12DD}</ProjectGuid>
     <RootNamespace>MediaSource</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
     <ProjectName>SimpleMediaSource</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -99,7 +98,7 @@
       <EnablePREfast>false</EnablePREfast>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -119,7 +118,7 @@
       <EnablePREfast>false</EnablePREfast>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -141,7 +140,7 @@
       <EnablePREfast>false</EnablePREfast>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -165,7 +164,7 @@
       <EnablePREfast>false</EnablePREfast>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp

@@ -27,11 +27,11 @@ namespace winrt::WindowsSample::implementation
             RETURN_IF_FAILED(m_streamList[i]->Initialize(this, i, MFSampleAllocatorUsage_UsesProvidedAllocator));
 
             RETURN_IF_FAILED(m_streamList[i]->GetStreamDescriptor(&streamDescriptorList[i]));
-        }
+            }
 
-        RETURN_IF_FAILED(MFCreatePresentationDescriptor(m_streamList.size(), streamDescriptorList.get(), &m_spPresentationDescriptor));
+            RETURN_IF_FAILED(MFCreatePresentationDescriptor(static_cast<DWORD>(m_streamList.size()), streamDescriptorList.get(), &m_spPresentationDescriptor));
 
-        m_sourceState = SourceState::Stopped;
+            m_sourceState = SourceState::Stopped;
 
         return S_OK;
     }

general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -59,7 +59,6 @@
     <Configuration>Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
     <RootNamespace>SimpleMediaSourceDriver</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PlatformToolset>WindowsUserModeDriver10.0</PlatformToolset>
@@ -128,6 +127,7 @@
       <WppEnabled>true</WppEnabled>
       <WppRecorderEnabled>true</WppRecorderEnabled>
       <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib</AdditionalDependencies>