summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Preston <stuart@chef.io>2018-03-07 22:05:57 -0800
committerStuart Preston <stuart@chef.io>2018-03-07 22:05:57 -0800
commitc0f1b675b3e488d117709112489461dfde9a4860 (patch)
tree4cc30781032095cf572ceb8fce06b6bce3e96834
parent1476ad5667bf57175d58b7ac8814a5a1eec976ae (diff)
downloadchef-c0f1b675b3e488d117709112489461dfde9a4860.tar.gz
Attempt to work around class not found issue
Signed-off-by: Stuart Preston <stuart@chef.io>
-rw-r--r--.gitattributes1
-rw-r--r--appveyor_registry.reg2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index bb9914a8b6..3122278bd5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,4 @@ distro/common/html/* merge=ignore
distro/common/man/man1/* merge=ignore
distro/common/man/man8/* merge=ignore
lib/chef/version.rb merge=ignore
+*.reg text eol=crlf \ No newline at end of file
diff --git a/appveyor_registry.reg b/appveyor_registry.reg
index 8f6a9d0115..293e98dd07 100644
--- a/appveyor_registry.reg
+++ b/appveyor_registry.reg
@@ -10,7 +10,7 @@ REGEDIT4
@="Chef.PowerShell"
[HKEY_CLASSES_ROOT\CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\InprocServer32]
-@="mscoree.dll"
+@="c:\\windows\\system32\\mscoree.dll"
"ThreadingModel"="Both"
"Class"="Chef.PowerShell"
"Assembly"="Chef.PowerShell, Version=1.0.14.0, Culture=neutral, PublicKeyToken=7def9f799d039a95"