Try Indellient PR minus UCRT bits

Signed-off-by: Thomas Powell <powell@progress.com>

5 files changed, 6 insertions, 15 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index d279c4415f..a3d5b7d3e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,7 +73,7 @@ PATH
       train-winrm (>= 0.2.5)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (17.10.36-x64-mingw-ucrt)
+    chef (17.10.36-x64-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
@@ -221,7 +221,6 @@ GEM
     ffi (1.15.5)
     ffi (1.15.5-x64-mingw32)
     ffi (1.15.5-x86-mingw32)
-    ffi (1.15.5-x64-mingw-ucrt)
     ffi-libarchive (1.1.3)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.4)
@@ -294,11 +293,6 @@ GEM
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
-    mixlib-shellout (3.2.7-x64-mingw-ucrt)
-      chef-utils
-      ffi-win32-extensions (~> 1.0.3)
-      win32-process (~> 0.9)
-      wmi-lite (~> 1.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     net-scp (4.0.0)
@@ -460,7 +454,6 @@ PLATFORMS
   ruby
   x64-mingw32
   x86-mingw32
-  x64-mingw-ucrt
 
 DEPENDENCIES
   appbundler
diff --git a/Rakefile b/Rakefile
index ec27b02cd2..c11e19eb57 100644
--- a/Rakefile
+++ b/Rakefile
@@ -63,7 +63,7 @@ end
 task install: "pre_install:all"
 
 # make sure we build the correct gemspec on windows
-gemspec = Gem.win_platform? ? "chef-universal-mingw-ucrt" : "chef"
+gemspec = Gem.win_platform? ? "chef-universal-mingw32" : "chef"
 Bundler::GemHelper.install_tasks name: gemspec
 
 # this gets appended to the normal bundler install helper
diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw32.gemspec
index 66be60af64..62999fc6eb 100644
--- a/chef-universal-mingw-ucrt.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -1,6 +1,6 @@
 gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
 
-gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
+gemspec.platform = Gem::Platform.new(%w{universal mingw32})
 
 gemspec.add_dependency "win32-api", "~> 1.10.1"
 gemspec.add_dependency "win32-event", "~> 0.6.1"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bdc9c67b36..47ea2d3d61 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -100,7 +100,7 @@ GEM
       train-winrm (>= 0.2.5)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (17.10.0-x64-mingw-ucrt)
+    chef (17.10.0-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
@@ -194,7 +194,6 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     ffi (1.15.5)
-    ffi (1.15.5-x64-mingw-ucrt)
     ffi (1.15.5-x64-mingw32)
     ffi (1.15.5-x86-mingw32)
     ffi-libarchive (1.1.3)
@@ -278,7 +277,7 @@ GEM
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
-    mixlib-shellout (3.2.7-x64-mingw-ucrt)
+    mixlib-shellout (3.2.7-universal-mingw32)
       chef-utils
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
@@ -469,7 +468,6 @@ PLATFORMS
   x64-mingw
   x64-mingw32
   x86-mingw32
-  x64-mingw-ucrt
 
 DEPENDENCIES
   artifactory
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 13f3ec1240..cf0a974016 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -73,7 +73,7 @@ package :msi do
   wix_candle_extension "WixUtilExtension"
   wix_light_extension "WixUtilExtension"
   signing_identity ENV.fetch("OMNIBUS_SIGNING_IDENTITY", "13B510D1CF1B3467856A064F1BEA12D0884D2528"), machine_store: true
-  parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-x64-mingw-ucrt/ext/win32-eventlog/chef-log.dll")),
+  parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-x64-mingw32/ext/win32-eventlog/chef-log.dll")),
              ProjectLocationDir: project_location_dir
 end