[MAIN] Updating the hash for a new version of the tools (#270)

* Updating the pipelines
Signed-off-by: John McCrae <[email protected]>

.bldr.toml

@@ -4,12 +4,6 @@ build_targets = [
 ]
 plan_path = "habitat"
 
-[chef-powershell-shim-x64]
-build_targets = [
-  "x86_64-windows"
-]
-plan_path = "habitat-x64"
-
 [dotnet-481-dev-pack-x64]
 build_targets = [
   "x86_64-windows"

.expeditor/verify.pipeline.yml

@@ -36,7 +36,7 @@ steps:
         host_os: windows
         shell: [ "powershell", "-Command" ]
 
-- label: ":windows: win-10-sdk-x64"
+- label: ":windows: win-11-sdk-x64"
   commands:
     - .expeditor/test_plan.ps1 -Plan habitat-win-10-sdk-x64
   expeditor:

Chef.Powershell.Core/Chef.Powershell.Core.csproj

@@ -16,11 +16,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.4.5" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.4.5" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="7.4.5" />
-    <PackageReference Include="Microsoft.PowerShell.ConsoleHost" Version="7.4.5" />
-    <PackageReference Include="Microsoft.WSMan.Management" Version="7.4.5" />
+    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.4.6" />
+    <PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.4.6" />
+    <PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="7.4.6" />
+    <PackageReference Include="Microsoft.PowerShell.ConsoleHost" Version="7.4.6" />
+    <PackageReference Include="Microsoft.WSMan.Management" Version="7.4.6" />
     <PackageReference Include="Microsoft.WSMan.Runtime" Version="7.4.6" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />

VERSION

@@ -1 +1 @@
-18.1.0
+19.1.0

chef-powershell/Gemfile.lock

@@ -32,7 +32,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.7)
+    rexml (3.3.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)

habitat-dotnet-481-dev-pack-x64/plan.ps1

@@ -1,4 +1,4 @@
-$pkg_name="dotnet-481-dev-pack"
+$pkg_name="dotnet-481-dev-pack-x64"
 $pkg_origin="core"
 $pkg_version="4.8.1"
 $pkg_description=".net framework 4.8.1 with dev pack"

habitat-vs-2022-x64/plan.ps1

@@ -7,29 +7,29 @@ $pkg_upstream_url="https://visualstudio.microsoft.com/downloads/#build-tools-for
 $pkg_license=@("Microsoft Software License")
 $pkg_maintainer="The Habitat Maintainers <[email protected]>"
 $pkg_source="https://aka.ms/vs/17/release/vs_BuildTools.exe"
-$pkg_shasum="99c7677154366062a43082921f40f3ce00ef2614dbf94db23b244dd13dc9443d"
+$pkg_shasum="ab3cff3d3a8c48804f47eb521cf138480f5ed4fe86476dd449a420777d7f2ead"
 $pkg_build_deps=@("core/7zip")
 
 $pkg_bin_dirs=@(
-    "Contents\VC\Tools\MSVC\14.41.34120\bin\HostX64\x64",
-    "Contents\VC\Redist\MSVC\14.40.33807\x64\Microsoft.VC143.CRT",
+    "Contents\VC\Tools\MSVC\14.42.34433\bin\HostX64\x64",
+    "Contents\VC\Redist\MSVC\14.42.34433\x64\Microsoft.VC143.CRT",
     "Contents\MSBuild\Current\Bin"
 )
 $pkg_lib_dirs=@(
-    "Contents\VC\Tools\MSVC\14.41.34120\atlmfc\lib\x64",
-    "Contents\VC\Tools\MSVC\14.41.34120\lib\x64"
+    "Contents\VC\Tools\MSVC\14.42.34433\atlmfc\lib\x64",
+    "Contents\VC\Tools\MSVC\14.42.34433\lib\x64"
 )
 $pkg_include_dirs=@(
-    "Contents\VC\Tools\MSVC\14.41.34120\atlmfc\include",
-    "Contents\VC\Tools\MSVC\14.41.34120\include"
+    "Contents\VC\Tools\MSVC\14.42.34433\atlmfc\include",
+    "Contents\VC\Tools\MSVC\14.42.34433\include"
 )
 
 function Invoke-SetupEnvironment {
     Set-RuntimeEnv "DisableRegistryUse" "true"
     Set-RuntimeEnv "UseEnv" "true"
-    Set-RuntimeEnv "VCToolsVersion" "14.41.34120"
+    Set-RuntimeEnv "VCToolsVersion" "14.42.34433"
     Set-RuntimeEnv "VisualStudioVersion" "17.0"
-    Set-RuntimeEnv -IsPath "VCToolsInstallDir_170" "$pkg_prefix\Contents\VC\Redist\MSVC\14.41.34120"
+    Set-RuntimeEnv -IsPath "VCToolsInstallDir_170" "$pkg_prefix\Contents\VC\Redist\MSVC\14.42.34433"
 }
 
 function Invoke-Unpack {

habitat-win-11-sdk-x64/plan.ps1

@@ -0,0 +1,48 @@
+$pkg_name="windows-11-sdk-x64"
+$pkg_origin="chef"
+$pkg_version="10.0.26100"
+$pkg_description="The Windows 11 SDK for Windows 11,(servicing release 10.0.26100.1742) provides the latest headers, libraries, metadata, and tools for building Windows 11 apps"
+$pkg_upstream_url="https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk"
+$pkg_license=@("Microsoft Software License")
+$pkg_maintainer="The Habitat Maintainers <[email protected]>"
+$pkg_source="https://download.microsoft.com/download/e/b/3/eb320eb1-b21e-4e6e-899e-d6aec552ecb0/KIT_BUNDLE_WINDOWSSDK_MEDIACREATION/winsdksetup.exe"
+$pkg_shasum="A8E6B6CC2DCEC9FDD4C35553A4CBF288C9CE5E4761D7A2762F06A3A95F1E530D"
+$pkg_build_deps=@("core/lessmsi")
+
+$pkg_bin_dirs=@(
+    "Windows Kits\10\bin\x64",
+    "Windows Kits\10\bin\$pkg_version.0\x64"
+)
+$pkg_lib_dirs=@(
+    "Windows Kits\10\Lib\$pkg_version.0\um\x64",
+    "Windows Kits\10\Lib\$pkg_version.0\ucrt\x64"
+)
+$pkg_include_dirs=@(
+    "Windows Kits\10\Include\$pkg_version.0\shared",
+    "Windows Kits\10\Include\$pkg_version.0\ucrt",
+    "Windows Kits\10\Include\$pkg_version.0\um",
+    "Windows Kits\10\Include\$pkg_version.0\winrt"
+)
+
+function Invoke-SetupEnvironment {
+    Set-RuntimeEnv -IsPath "WindowsSdkDir_10" "$pkg_prefix\Windows Kits\10"
+}
+
+function Invoke-Unpack {
+    Start-Process "$HAB_CACHE_SRC_PATH/$pkg_filename" -Wait -ArgumentList "/features OptionId.DesktopCPPx64 /quiet /layout $HAB_CACHE_SRC_PATH/$pkg_dirname"
+    Push-Location "$HAB_CACHE_SRC_PATH/$pkg_dirname"
+    try {
+        Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname/installers" -Include *.msi -Recurse | ForEach-Object {
+            lessmsi x $_
+        }
+    } finally { Pop-Location }
+    Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname" -Include @("x86", "arm", "arm64") -Recurse | ForEach-Object {
+        Remove-Item $_ -Recurse -Force
+    }
+}
+
+function Invoke-Install {
+    Get-ChildItem "$HAB_CACHE_SRC_PATH/$pkg_dirname" -Include "Windows Kits" -Recurse | ForEach-Object {
+        Copy-Item $_ "$pkg_prefix" -Exclude "*.duplicate*" -Recurse -Force
+    }
+}

habitat/plan.ps1

@@ -1,7 +1,8 @@
 $env:HAB_BLDR_CHANNEL = "LTS-2024"
+$env:MSBuildEnableWorkloadResolver = $false
 $pkg_name="chef-powershell-shim"
 $pkg_origin="chef"
-$pkg_version="0.4.0"
+$pkg_version="19.1.0"
 $pkg_maintainer="The Habitat Maintainers <[email protected]>"
 $pkg_license=@("Apache-2.0")
 $pkg_build_deps=@(
@@ -16,6 +17,8 @@ $pkg_bin_dirs=@("bin")
 function Invoke-SetupEnvironment {
   Push-RuntimeEnv -IsPath "RUBY_DLL_PATH" "$pkg_prefix/bin"
   Set-RuntimeEnv -IsPath "CHEF_POWERSHELL_BIN" "$pkg_prefix/bin"
+
+  Set-RuntimeEnv -IsPath "MSBuildSDKsPath" "$(Get-HabPackagePath dotnet-core-sdk)\bin\Sdk\8.0.303\Sdks"
 }
 
 function Invoke-Build {