Take 2 on the UCRT gem. Adding in support for the updated mixlib-archive gem

Signed-off-by: John McCrae <john.mccrae@progress.com>

4 files changed, 44 insertions, 41 deletions

diff --git a/Gemfile b/Gemfile
index 052b21cf6b..1e9695e764 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,12 @@ gem "chef", path: "."
 
 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 
-# Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update.
+# Need to file a bug with rest-client. In the meantime, we can use this until they accept the update.
 gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1"
 
+# Testing a new mixlib-arthive gem to get it working on Windows properly
+gem "mixlib-archive", git: "https://github.com/chef/mixlib-archive", branch: "jfm/ucrt_update1"
+
 gem "ffi", ">= 1.15.5"
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
diff --git a/chef-ucrt.gemspec b/chef-ucrt.gemspec
new file mode 100644
index 0000000000..8a97807079
--- /dev/null
+++ b/chef-ucrt.gemspec
@@ -0,0 +1,23 @@
+gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
+
+gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
+
+gemspec.add_dependency "win32-api", "~> 1.10.0"
+gemspec.add_dependency "win32-event", "~> 0.6.1"
+# TODO: Relax this pin and make the necessary updates. The issue originally
+# leading to this pin has been fixed in 0.6.5.
+gemspec.add_dependency "win32-eventlog", "0.6.3"
+gemspec.add_dependency "win32-mmap", "~> 0.4.1"
+gemspec.add_dependency "win32-mutex", "~> 0.4.2"
+gemspec.add_dependency "win32-process", "~> 0.10"
+gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
+gemspec.add_dependency "wmi-lite", "~> 1.0"
+gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
+gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
+gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store
+gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
+gemspec.extensions << "ext/win32-eventlog/Rakefile"
+gemspec.files += Dir.glob("{distro,ext}/**/*")
+gemspec.required_ruby_version = ">= 3.1"
+
+gemspec
diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw-ucrt.gemspec
deleted file mode 100644
index 8e472ccdda..0000000000
--- a/chef-universal-mingw-ucrt.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
-
-gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
-
-# gemspec.add_dependency "win32-api", "~> 1.10.0"
-# gemspec.add_dependency "win32-event", "~> 0.6.1"
-# TODO: Relax this pin and make the necessary updaets. The issue originally
-# leading to this pin has been fixed in 0.6.5.
-# gemspec.add_dependency "win32-eventlog", "0.6.3"
-# gemspec.add_dependency "win32-mmap", "~> 0.4.1"
-# gemspec.add_dependency "win32-mutex", "~> 0.4.2"
-# gemspec.add_dependency "win32-process", "~> 0.9"
-# gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
-# gemspec.add_dependency "wmi-lite", "~> 1.0"
-# gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
-# gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
-# gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store
-# gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
-gemspec.extensions << "ext/win32-eventlog/Rakefile"
-gemspec.files += Dir.glob("{distro,ext}/**/*")
-gemspec.required_ruby_version = ">= 3.1.2"
-
-gemspec
diff --git a/chef.gemspec b/chef.gemspec
index fa9d620938..59add590ff 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -24,22 +24,22 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1.0"
 
-  # Adding Windows support in here
-  if RUBY_PLATFORM == "x64-mingw-ucrt"
-    s.add_dependency "win32-mmap", "~> 0.4.1"
-    s.add_dependency "win32-mutex", "~> 0.4.2"
-    s.add_dependency "chef-powershell", "~> 1.0.12"
-    s.add_dependency "win32-api", "~> 1.10.0"
-    s.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
-    s.add_dependency "win32-event", "~> 0.6.1"
-    s.add_dependency "win32-taskscheduler", "~> 2.0"
-    s.add_dependency "win32-eventlog", "0.6.3"
-    s.add_dependency "win32-process", "~> 0.10"
-    s.add_dependency "wmi-lite", "~> 1.0"
-    s.add_dependency "iso8601", ">= 0.12.1", "< 0.14"
-    s.add_dependency "win32-certstore", "~> 0.6.15"
-    s.extensions << "ext/win32-eventlog/Rakefile"
-  end
+  # # Adding Windows support in here
+  # if RUBY_PLATFORM == "x64-mingw-ucrt"
+  #   s.add_dependency "win32-mmap", "~> 0.4.1"
+  #   s.add_dependency "win32-mutex", "~> 0.4.2"
+  #   s.add_dependency "chef-powershell", "~> 1.0.12"
+  #   s.add_dependency "win32-api", "~> 1.10.0"
+  #   s.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
+  #   s.add_dependency "win32-event", "~> 0.6.1"
+  #   s.add_dependency "win32-taskscheduler", "~> 2.0"
+  #   s.add_dependency "win32-eventlog", "0.6.3"
+  #   s.add_dependency "win32-process", "~> 0.10"
+  #   s.add_dependency "wmi-lite", "~> 1.0"
+  #   s.add_dependency "iso8601", ">= 0.12.1", "< 0.14"
+  #   s.add_dependency "win32-certstore", "~> 0.6.15"
+  #   s.extensions << "ext/win32-eventlog/Rakefile"
+  # end
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
   s.add_dependency "mixlib-authentication", ">= 2.1", "< 4"
   s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
-  s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
+  # s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 18.0"
   s.add_dependency "inspec-core", ">= 5"