From cf980e68307307363fe9cc344931e20eb5e5ef18 Mon Sep 17 00:00:00 2001
From: Ruben Guerrero <rubengu@microsoft.com>
Date: Thu, 2 Mar 2023 11:02:48 -0800
Subject: [PATCH] Microsoft.Management.Configuration Windows target platform
 (#3032)

Move Microsoft.Management.Configuration projects to target 10.0.19041.0.
Fix UTs Microsoft.Management.Configuration flaky tests.
---
 .../Microsoft.Management.Configuration.Processor.csproj       | 4 ++--
 .../Microsoft.Management.Configuration.Projection.csproj      | 4 ++--
 .../Helpers/TempFile.cs                                       | 2 +-
 .../Tests/ConfigurationDetailsTests.cs                        | 4 ++--
 .../Microsoft.Management.Configuration.vcxproj                | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj b/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj
index e753f77e7e..63bb751b0d 100644
--- a/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj
+++ b/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <Nullable>enable</Nullable>
     <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <Platforms>x64;x86;arm64</Platforms>
@@ -19,7 +19,7 @@
 
   <PropertyGroup>
     <CsWinRTComponent>true</CsWinRTComponent>
-    <CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
+    <CsWinRTWindowsMetadata>10.0.19041.0</CsWinRTWindowsMetadata>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj b/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj
index 7af8ddd0e6..c586c79cf8 100644
--- a/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj
+++ b/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
 	<Platforms>x64;x86;arm64</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <CsWinRTIncludes>Microsoft.Management.Configuration</CsWinRTIncludes>
     <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
-    <CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
+    <CsWinRTWindowsMetadata>10.0.19041.0</CsWinRTWindowsMetadata>
     <!-- Ensure Support for Windows 10, Version 1809 -->
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
diff --git a/src/Microsoft.Management.Configuration.UnitTests/Helpers/TempFile.cs b/src/Microsoft.Management.Configuration.UnitTests/Helpers/TempFile.cs
index 4b3dfa83d6..5306472683 100644
--- a/src/Microsoft.Management.Configuration.UnitTests/Helpers/TempFile.cs
+++ b/src/Microsoft.Management.Configuration.UnitTests/Helpers/TempFile.cs
@@ -81,7 +81,7 @@ public void CreateFile(string? content = null)
         {
             if (content is null)
             {
-                File.Create(this.FullFileName);
+                using var fs = File.Create(this.FullFileName);
             }
             else
             {
diff --git a/src/Microsoft.Management.Configuration.UnitTests/Tests/ConfigurationDetailsTests.cs b/src/Microsoft.Management.Configuration.UnitTests/Tests/ConfigurationDetailsTests.cs
index 5b4500fb43..7d6c648e56 100644
--- a/src/Microsoft.Management.Configuration.UnitTests/Tests/ConfigurationDetailsTests.cs
+++ b/src/Microsoft.Management.Configuration.UnitTests/Tests/ConfigurationDetailsTests.cs
@@ -185,8 +185,8 @@ private ConfigurationUnit CreteConfigurationUnit()
         private (DscResourceInfoInternal dscResourceInfo, PSModuleInfo psModuleInfo) GetResourceAndModuleInfo(ConfigurationUnit unit)
         {
             // This is easier than trying to mock sealed class from external code...
-            var testEnv = this.fixture.PrepareTestProcessorEnvironment();
-            testEnv.ValidateRunspace();
+            var testEnv = this.fixture.PrepareTestProcessorEnvironment(true);
+
             var dscResourceInfo = testEnv.GetDscResource(new ConfigurationUnitInternal(unit, null));
             var psModuleInfo = testEnv.GetAvailableModule(PowerShellHelpers.CreateModuleSpecification("xSimpleTestResource", "0.0.0.1"));
 
diff --git a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj
index 80df710d4b..e68f313923 100644
--- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj
+++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj
@@ -12,7 +12,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
     <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>