diff --git a/.bldr.toml b/.bldr.toml
index eab0259..682473e 100644
--- a/.bldr.toml
+++ b/.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"
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 5330250..ec0c0d6 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.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:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ece05a..7d76769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
+
diff --git a/Chef.Powershell.Core/Chef.Powershell.Core.csproj b/Chef.Powershell.Core/Chef.Powershell.Core.csproj
index a55b9f2..eccc07e 100644
--- a/Chef.Powershell.Core/Chef.Powershell.Core.csproj
+++ b/Chef.Powershell.Core/Chef.Powershell.Core.csproj
@@ -16,15 +16,15 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/VERSION b/VERSION
index d4df104..fc558a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.1.0
+18.6.2
diff --git a/chef-powershell/Gemfile.lock b/chef-powershell/Gemfile.lock
index dde8da1..0149f9c 100644
--- a/chef-powershell/Gemfile.lock
+++ b/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)
diff --git a/habitat-dotnet-481-dev-pack-x64/plan.ps1 b/habitat-dotnet-481-dev-pack-x64/plan.ps1
index 5f81858..58f7f4f 100644
--- a/habitat-dotnet-481-dev-pack-x64/plan.ps1
+++ b/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"
diff --git a/habitat-vs-2022-x64/plan.ps1 b/habitat-vs-2022-x64/plan.ps1
index d98bc35..669df9d 100644
--- a/habitat-vs-2022-x64/plan.ps1
+++ b/habitat-vs-2022-x64/plan.ps1
@@ -7,7 +7,7 @@ $pkg_upstream_url="https://visualstudio.microsoft.com/downloads/#build-tools-for
$pkg_license=@("Microsoft Software License")
$pkg_maintainer="The Habitat Maintainers "
$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=@(
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index 4d2d223..088f8c5 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -1,7 +1,8 @@
$env:HAB_BLDR_CHANNEL="stable"
+$env:MSBuildEnableWorkloadResolver = $false
$pkg_name="chef-powershell-shim"
$pkg_origin="chef"
-$pkg_version="0.4.0"
+$pkg_version="18.6.2"
$pkg_maintainer="The Habitat Maintainers "
$pkg_license=@("Apache-2.0")
$pkg_build_deps=@(
@@ -9,7 +10,7 @@ $pkg_build_deps=@(
"core/dotnet-481-dev-pack/4.8.1/20241022062559", #, As of August 2024, this package should be installed by default on all Windows devices.
"core/windows-11-sdk/10.0.26100/20241022063945",
"core/visual-build-tools-2022/17.11.0/20241023134911"
- "core/dotnet-8-sdk/8.0.400/20241022062821" # this should be pulling down the .net 8 or later sdk, not the one we have locally in this repo
+ "chef/dotnet-8-sdk-x64/8.0.400/20241213183042" # this should be pulling down the .net 8 or later sdk, not the one we have locally in this repo
)
$pkg_bin_dirs=@("bin")
@@ -23,7 +24,7 @@ function Invoke-Build {
nuget restore $HAB_CACHE_SRC_PATH/$pkg_dirname/Chef.Powershell/packages.config -PackagesDirectory $HAB_CACHE_SRC_PATH/$pkg_dirname/packages -Source "https://www.nuget.org/api/v2"
Write-Buildline " ** Setting the SDK Path - it gets borked during the nuget restore"
- $env:MSBuildSdksPath="$(Get-HabPackagePath dotnet-8-sdk)\bin\sdk\8.0.400\Sdks"
+ $env:MSBuildSdksPath="$(Get-HabPackagePath dotnet-8-sdk-x64)\bin\sdk\8.0.400\Sdks"
$env:MSBuildSdksPath
MSBuild $HAB_CACHE_SRC_PATH/$pkg_dirname/Chef.Powershell.Wrapper/Chef.Powershell.Wrapper.vcxproj /t:Build /p:Configuration=Release /p:Platform=x64