From 8276b7833e6975396ebec180d7ecb3f66b2f867e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 14:30:20 +0000 Subject: [PATCH 01/12] Updating the hash for a new version of the tools Signed-off-by: John --- .expeditor/build_gems.ps1 | 2 +- habitat-vs-2022-x64/plan.ps1 | 18 +++++++++--------- habitat/plan.ps1 | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.expeditor/build_gems.ps1 b/.expeditor/build_gems.ps1 index 0674879..b06ac83 100644 --- a/.expeditor/build_gems.ps1 +++ b/.expeditor/build_gems.ps1 @@ -24,7 +24,7 @@ $env:MSBuildEnableWorkloadResolver = "false" # setting the channel in this way gets access to the LTS channel and falls back to stable if the plan doesn't live there. Write-Output "--- :shovel: Setting the BLDR Channel to LTS" -$env:HAB_BLDR_CHANNEL="LTS-2024" +$env:HAB_BLDR_CHANNEL="stable" Write-Output "`r" Write-Output "--- :screwdriver: Installing Habitat via Choco" diff --git a/habitat-vs-2022-x64/plan.ps1 b/habitat-vs-2022-x64/plan.ps1 index 75beae3..af81413 100644 --- a/habitat-vs-2022-x64/plan.ps1 +++ b/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 " $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 { diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 42b9bcb..9b6636b 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -6,9 +6,9 @@ $pkg_maintainer="The Habitat Maintainers " $pkg_license=@("Apache-2.0") $pkg_build_deps=@( "core/nuget", - "core/dotnet-481-dev-pack", #, As of August 2024, this package should be installed by default on all Windows devices. - "core/windows-11-sdk", - "core/visual-build-tools-2022", + "chef/dotnet-481-dev-pack", #, As of August 2024, this package should be installed by default on all Windows devices. + "chef/windows-11-sdk", + "chef/visual-build-tools-2022-x64", "core/dotnet-core-sdk" # this should be pulling down the .net 8 or later sdk, not the one we have locally in this repo ) $pkg_bin_dirs=@("bin") From 2532ffe7de0dd3132fed1484d581912495dd7e01 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 16:57:35 +0000 Subject: [PATCH 02/12] Updating the hash for a new version of the tools Signed-off-by: John --- habitat/plan.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 9b6636b..42b9bcb 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -6,9 +6,9 @@ $pkg_maintainer="The Habitat Maintainers " $pkg_license=@("Apache-2.0") $pkg_build_deps=@( "core/nuget", - "chef/dotnet-481-dev-pack", #, As of August 2024, this package should be installed by default on all Windows devices. - "chef/windows-11-sdk", - "chef/visual-build-tools-2022-x64", + "core/dotnet-481-dev-pack", #, As of August 2024, this package should be installed by default on all Windows devices. + "core/windows-11-sdk", + "core/visual-build-tools-2022", "core/dotnet-core-sdk" # this should be pulling down the .net 8 or later sdk, not the one we have locally in this repo ) $pkg_bin_dirs=@("bin") From 32c0e0f2b49f757c827bd9c716d7dbd93b58c597 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 18:17:51 +0000 Subject: [PATCH 03/12] Debugging Signed-off-by: John --- habitat/plan.ps1 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 42b9bcb..9d82f4e 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -16,6 +16,13 @@ $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" + + # Begin testing here + $sdks = dotnet --list-sdks + $latest = $sdks | Select-Object -Last 1 + # $version = $latest.split(' ')[0] + Write-Host "Latest SDK: $latest" + Write-Host "`r" } function Invoke-Build { From eb88c0f837a3b422cba00a27d116d85fe7664cec Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 19:02:43 +0000 Subject: [PATCH 04/12] Debugging Signed-off-by: John --- habitat/plan.ps1 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 9d82f4e..f426918 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -18,11 +18,14 @@ function Invoke-SetupEnvironment { Set-RuntimeEnv -IsPath "CHEF_POWERSHELL_BIN" "$pkg_prefix/bin" # Begin testing here - $sdks = dotnet --list-sdks - $latest = $sdks | Select-Object -Last 1 - # $version = $latest.split(' ')[0] - Write-Host "Latest SDK: $latest" - Write-Host "`r" + $win11SdkPath = "$(Get-HabPackagePath windows-11-sdk)" + $dotnetCoreSdkPath = "$(Get-HabPackagePath dotnet-core-sdk)" + Write-Host "Here are my paths" + Write-Host "win11SdkPath: $win11SdkPath" + Write-Host "dotnetCoreSdkPath: $dotnetCoreSdkPath" + Write-Host "Testing if the paths exist" + Test-Path $win11SdkPath + Test-Path $dotnetCoreSdkPath } function Invoke-Build { From 93879c6c2468ffc4c7c530d2b43958117a268025 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 20:36:38 +0000 Subject: [PATCH 05/12] Debugging Signed-off-by: John --- habitat/plan.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index f426918..d37063d 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -18,6 +18,8 @@ function Invoke-SetupEnvironment { Set-RuntimeEnv -IsPath "CHEF_POWERSHELL_BIN" "$pkg_prefix/bin" # Begin testing here + Write-Host "What is system path?" + $env:Path $win11SdkPath = "$(Get-HabPackagePath windows-11-sdk)" $dotnetCoreSdkPath = "$(Get-HabPackagePath dotnet-core-sdk)" Write-Host "Here are my paths" @@ -26,6 +28,13 @@ function Invoke-SetupEnvironment { Write-Host "Testing if the paths exist" Test-Path $win11SdkPath Test-Path $dotnetCoreSdkPath + Write-Host "Testing if the paths are directories" + Test-Path $win11SdkPath -PathType Container + Test-Path $dotnetCoreSdkPath -PathType Container + Write-Host "Finding the missing property file in Habitat" + Get-ChildItem -Path $dotnetCoreSdkPath -Recurse -Filter "MMicrosoft.NET.Sdk.ImportWorkloads.props" + Write-Host "Finding the missing property file anywhere on C:" + Get-ChildItem -Path C:\ -Recurse -Filter "MMicrosoft.NET.Sdk.ImportWorkloads.props" } function Invoke-Build { From e7eda560ee59a834ef79cea3d39e603a09fafe8e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 21:05:55 +0000 Subject: [PATCH 06/12] Debugging Signed-off-by: John --- habitat/plan.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index d37063d..c6fe2bd 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -32,9 +32,9 @@ function Invoke-SetupEnvironment { Test-Path $win11SdkPath -PathType Container Test-Path $dotnetCoreSdkPath -PathType Container Write-Host "Finding the missing property file in Habitat" - Get-ChildItem -Path $dotnetCoreSdkPath -Recurse -Filter "MMicrosoft.NET.Sdk.ImportWorkloads.props" + Get-ChildItem -Path $dotnetCoreSdkPath -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue Write-Host "Finding the missing property file anywhere on C:" - Get-ChildItem -Path C:\ -Recurse -Filter "MMicrosoft.NET.Sdk.ImportWorkloads.props" + Get-ChildItem -Path C:\ -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue } function Invoke-Build { From f9d4e3990968b8eb8b18874336dd8c2f1812293b Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Dec 2024 21:47:56 +0000 Subject: [PATCH 07/12] Debugging Signed-off-by: John --- habitat/plan.ps1 | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index c6fe2bd..4666144 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -17,24 +17,27 @@ 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" + Set-RuntimeEnv "MSBuildEnableWorkloadResolver" $false + # Begin testing here - Write-Host "What is system path?" - $env:Path - $win11SdkPath = "$(Get-HabPackagePath windows-11-sdk)" - $dotnetCoreSdkPath = "$(Get-HabPackagePath dotnet-core-sdk)" - Write-Host "Here are my paths" - Write-Host "win11SdkPath: $win11SdkPath" - Write-Host "dotnetCoreSdkPath: $dotnetCoreSdkPath" - Write-Host "Testing if the paths exist" - Test-Path $win11SdkPath - Test-Path $dotnetCoreSdkPath - Write-Host "Testing if the paths are directories" - Test-Path $win11SdkPath -PathType Container - Test-Path $dotnetCoreSdkPath -PathType Container - Write-Host "Finding the missing property file in Habitat" - Get-ChildItem -Path $dotnetCoreSdkPath -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue - Write-Host "Finding the missing property file anywhere on C:" - Get-ChildItem -Path C:\ -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue + # Write-Host "What is system path?" + # $env:Path + # $win11SdkPath = "$(Get-HabPackagePath windows-11-sdk)" + # $dotnetCoreSdkPath = "$(Get-HabPackagePath dotnet-core-sdk)" + # Write-Host "Here are my paths" + # Write-Host "win11SdkPath: $win11SdkPath" + # Write-Host "dotnetCoreSdkPath: $dotnetCoreSdkPath" + # Write-Host "Testing if the paths exist" + # Test-Path $win11SdkPath + # Test-Path $dotnetCoreSdkPath + # Write-Host "Testing if the paths are directories" + # Test-Path $win11SdkPath -PathType Container + # Test-Path $dotnetCoreSdkPath -PathType Container + # Write-Host "Finding the missing property file in Habitat" + # Get-ChildItem -Path $dotnetCoreSdkPath -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue + # Write-Host "Finding the missing property file anywhere on C:" + # Get-ChildItem -Path C:\ -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue } function Invoke-Build { From 0349f9f9b85138f8aa6d97caa36d44e93f35accd Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Dec 2024 14:16:07 +0000 Subject: [PATCH 08/12] Working? Signed-off-by: John --- .bldr.toml | 6 ------ .expeditor/build_gems.ps1 | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) 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/build_gems.ps1 b/.expeditor/build_gems.ps1 index b06ac83..0674879 100644 --- a/.expeditor/build_gems.ps1 +++ b/.expeditor/build_gems.ps1 @@ -24,7 +24,7 @@ $env:MSBuildEnableWorkloadResolver = "false" # setting the channel in this way gets access to the LTS channel and falls back to stable if the plan doesn't live there. Write-Output "--- :shovel: Setting the BLDR Channel to LTS" -$env:HAB_BLDR_CHANNEL="stable" +$env:HAB_BLDR_CHANNEL="LTS-2024" Write-Output "`r" Write-Output "--- :screwdriver: Installing Habitat via Choco" From d543defc4eb0cdfb88d106d3470d4665f7e4dacc Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Dec 2024 15:11:12 +0000 Subject: [PATCH 09/12] Working! Signed-off-by: John --- habitat-win-11-sdk-x64/plan.ps1 | 48 +++++++++++++++++++++++++++++++++ habitat/plan.ps1 | 21 +-------------- 2 files changed, 49 insertions(+), 20 deletions(-) create mode 100644 habitat-win-11-sdk-x64/plan.ps1 diff --git a/habitat-win-11-sdk-x64/plan.ps1 b/habitat-win-11-sdk-x64/plan.ps1 new file mode 100644 index 0000000..5f5ee1c --- /dev/null +++ b/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 " +$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 + } +} diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 4666144..aa82f9d 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -1,4 +1,5 @@ $env:HAB_BLDR_CHANNEL = "LTS-2024" +$env:MSBuildEnableWorkloadResolver = $false $pkg_name="chef-powershell-shim" $pkg_origin="chef" $pkg_version="0.4.0" @@ -18,26 +19,6 @@ function Invoke-SetupEnvironment { Set-RuntimeEnv -IsPath "CHEF_POWERSHELL_BIN" "$pkg_prefix/bin" Set-RuntimeEnv -IsPath "MSBuildSDKsPath" "$(Get-HabPackagePath dotnet-core-sdk)\bin\Sdk\8.0.303\Sdks" - Set-RuntimeEnv "MSBuildEnableWorkloadResolver" $false - - # Begin testing here - # Write-Host "What is system path?" - # $env:Path - # $win11SdkPath = "$(Get-HabPackagePath windows-11-sdk)" - # $dotnetCoreSdkPath = "$(Get-HabPackagePath dotnet-core-sdk)" - # Write-Host "Here are my paths" - # Write-Host "win11SdkPath: $win11SdkPath" - # Write-Host "dotnetCoreSdkPath: $dotnetCoreSdkPath" - # Write-Host "Testing if the paths exist" - # Test-Path $win11SdkPath - # Test-Path $dotnetCoreSdkPath - # Write-Host "Testing if the paths are directories" - # Test-Path $win11SdkPath -PathType Container - # Test-Path $dotnetCoreSdkPath -PathType Container - # Write-Host "Finding the missing property file in Habitat" - # Get-ChildItem -Path $dotnetCoreSdkPath -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue - # Write-Host "Finding the missing property file anywhere on C:" - # Get-ChildItem -Path C:\ -Recurse -Filter "Microsoft.NET.Sdk.ImportWorkloads.props" -ErrorAction SilentlyContinue } function Invoke-Build { From 5ab6cbae6bf4f2fb16e90af330a16f11fcedc872 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Dec 2024 15:13:16 +0000 Subject: [PATCH 10/12] Working! Signed-off-by: John --- chef-powershell/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 5d6335ab43cb3361eef656bdd70021f510f2c834 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 16 Dec 2024 15:04:09 +0000 Subject: [PATCH 11/12] Working! Signed-off-by: John --- habitat-dotnet-481-dev-pack-x64/plan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 92334ec6b2689331517d3ff286ac3e990cc39f29 Mon Sep 17 00:00:00 2001 From: John McCrae Date: Mon, 16 Dec 2024 13:08:20 -0600 Subject: [PATCH 12/12] Clearing up build issues Signed-off-by: John McCrae --- .expeditor/verify.pipeline.yml | 2 +- Chef.Powershell.Core/Chef.Powershell.Core.csproj | 10 +++++----- VERSION | 2 +- habitat/plan.ps1 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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/Chef.Powershell.Core/Chef.Powershell.Core.csproj b/Chef.Powershell.Core/Chef.Powershell.Core.csproj index 8c5c502..a0ce2f6 100644 --- a/Chef.Powershell.Core/Chef.Powershell.Core.csproj +++ b/Chef.Powershell.Core/Chef.Powershell.Core.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/VERSION b/VERSION index d4df104..8bf109b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.1.0 +19.1.0 diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index aa82f9d..d55312b 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -2,7 +2,7 @@ $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 " $pkg_license=@("Apache-2.0") $pkg_build_deps=@(