Permalink
Browse files

Upgraded to Wix 3.7.

  • Loading branch information...
1 parent 8b243b7 commit ab1e3a6d083af61e6dd06b4af949a7d2ed08e73b @dblock dblock committed Aug 31, 2013
View
@@ -9,6 +9,11 @@ Features
* [#48](https://github.com/dblock/waffle/pull/48): Added username/password authentication support for [Apache Shiro](http://shiro.apache.org/) - [@davidmc24](https://github.com/davidmc24).
* [#51](https://github.com/dblock/waffle/pull/51): Added negotiate authentication support for [Apache Shiro](http://shiro.apache.org/) - [@bhamail](https://github.com/bhamail).
+Bugs
+----
+
+* [#58](https://github.com/dblock/waffle/pull/58): Fix: error in `InitializeSecurityContext: The buffers supplied to a function was too small.` when a user belongs to many groups - [@dblock](https://github.com/dblock).
+
Development
-----------
@@ -46,7 +51,7 @@ Features
* [#23](https://github.com/dblock/waffle/pull/23) Added `waffle.util.WaffleInfo` which collects system information useful for debugging - [@ryantxu](https://github.com/ryantxu).
* [#28](https://github.com/dblock/waffle/pull/28) Added `waffle-jetty` project. This lets developers run Waffle directly within the IDE - [@ryantxu](https://github.com/ryantxu).
* [#33](https://github.com/dblock/waffle/pull/33): Added support for servlet3 programmatic login - [@amergey](https://github.com/amergey).
-
+* Upgraded Wix to version 3.7 - [@dblock](https://github.com/dblock).
Interface Changes
-----------------
@@ -37,9 +37,9 @@ Download NUnit from [here](http://nunit.org).
Download and install MSBuild Community Tasks from [here](https://code.google.com/p/msbuildtasks/downloads/list).
-### Wix Toolset 3.5
+### Wix Toolset 3.7
-Download and install the Wix toolset, specifically version 3.5 from [here](https://wix.codeplex.com/releases/view/60102).
+Download and install the Wix toolset, specifically version 3.7 from [here](https://wix.codeplex.com/releases/view/99514).
### Eclipse
@@ -8,7 +8,8 @@
<OutputName>Waffle.Windows.AuthProvider</OutputName>
<OutputType>Module</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
- <WixToolPath>$(ProgramFiles)\Windows Installer XML v3.5\bin\</WixToolPath>
+ <WixToolPath>$(ProgramFiles)\WiX Toolset v3.7\bin</WixToolPath>
+ <RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -14,51 +14,51 @@
<Directory Id="MergeRedirectFolder">
<Component Id="WindowsAuthProvider" Guid="74ad70ef-aa1a-4d8f-a31c-dda1716b7dd1">
<File Id="WindowsAuthProviderDll" Source="$(var.MSBuildProjectDirectory)\Source\WindowsAuthProvider\bin\$(var.Configuration)\Waffle.Windows.AuthProvider.dll" KeyPath="yes" Name="Waffle.Windows.AuthProvider.dll" />
- <RegistryKey Id="RegAdvapi32.LogonType" Root="HKCR" Key="Record\{FA3F1B69-D60F-4CBF-9A44-8CE47E5C9FF3}\$(var.ProductVersion)" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAdvapi32.LogonType" Root="HKCR" Key="Record\{FA3F1B69-D60F-4CBF-9A44-8CE47E5C9FF3}\$(var.ProductVersion)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Name="Class" Value="Waffle.Windows.Advapi32+LogonType" />
<RegistryValue Type="string" Name="Assembly" Value="Waffle.Windows.AuthProvider" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v2.0.50727" />
<RegistryValue Type="string" Name="CodeBase" Value="[#WindowsAuthProviderDll]" />
</RegistryKey>
- <RegistryKey Id="RegAdvapi32.LogonProvider" Root="HKCR" Key="Record\{32843EC8-13A5-499A-AED3-EAEB08C3381A}\$(var.ProductVersion)" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAdvapi32.LogonProvider" Root="HKCR" Key="Record\{32843EC8-13A5-499A-AED3-EAEB08C3381A}\$(var.ProductVersion)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Name="Class" Value="Waffle.Windows.Advapi32+LogonProvider" />
<RegistryValue Type="string" Name="Assembly" Value="Waffle.Windows.AuthProvider" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v2.0.50727" />
<RegistryValue Type="string" Name="CodeBase" Value="[#WindowsAuthProviderDll]" />
</RegistryKey>
- <RegistryKey Id="RegAdvapi32.SID_NAME_USE" Root="HKCR" Key="Record\{673D9C4F-13FD-430C-AFD1-4E706FFC0DC4}\$(var.ProductVersion)" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAdvapi32.SID_NAME_USE" Root="HKCR" Key="Record\{673D9C4F-13FD-430C-AFD1-4E706FFC0DC4}\$(var.ProductVersion)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Name="Class" Value="Waffle.Windows.Advapi32+SID_NAME_USE" />
<RegistryValue Type="string" Name="Assembly" Value="Waffle.Windows.AuthProvider" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v2.0.50727" />
<RegistryValue Type="string" Name="CodeBase" Value="[#WindowsAuthProviderDll]" />
</RegistryKey>
- <RegistryKey Id="RegAuth" Root="HKCR" Key="Waffle.Windows.AuthProvider" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAuth" Root="HKCR" Key="Waffle.Windows.AuthProvider" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Value="Waffle.Windows.AuthProvider.WindowsAuthProviderImpl" />
</RegistryKey>
- <RegistryKey Id="RegAuthCLSID" Root="HKCR" Key="Waffle.Windows.AuthProvider\CLSID" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAuthCLSID" Root="HKCR" Key="Waffle.Windows.AuthProvider\CLSID" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Value="{78FA881E-5141-3B68-A76C-487871F4846A}" />
</RegistryKey>
- <RegistryKey Id="RegAuthCLSIDGuid" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAuthCLSIDGuid" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Value="Waffle.Windows.AuthProvider.WindowsAuthProviderImpl" />
</RegistryKey>
- <RegistryKey Id="RegAuthCLSIDGuidIS32" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\InprocServer32" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAuthCLSIDGuidIS32" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\InprocServer32" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Value="mscoree.dll" />
<RegistryValue Type="string" Name="ThreadingModel" Value="Both" />
<RegistryValue Type="string" Name="Class" Value="Waffle.Windows.AuthProvider.WindowsAuthProviderImpl" />
<RegistryValue Type="string" Name="Assembly" Value="Waffle.Windows.AuthProvider" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v2.0.50727" />
<RegistryValue Type="string" Name="CodeBase" Value="[#WindowsAuthProviderDll]" />
</RegistryKey>
- <RegistryKey Id="RegAuthCLSIDGuidIS32Ver" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\InprocServer32\$(var.ProductVersion)" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAuthCLSIDGuidIS32Ver" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\InprocServer32\$(var.ProductVersion)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Name="Class" Value="Waffle.Windows.AuthProvider.WindowsAuthProviderImpl" />
<RegistryValue Type="string" Name="Assembly" Value="Waffle.Windows.AuthProvider" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v2.0.50727" />
<RegistryValue Type="string" Name="CodeBase" Value="[#WindowsAuthProviderDll]" />
</RegistryKey>
- <RegistryKey Id="RegAuthCLSIDProgId" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\ProgId" Action="createAndRemoveOnUninstall">
+ <RegistryKey Id="RegAuthCLSIDProgId" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\ProgId" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Type="string" Value="Waffle.Windows.AuthProvider" />
</RegistryKey>
- <RegistryKey Id="RegAuthCLSIDCategories" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\Implemented Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}" Action="createAndRemoveOnUninstall" />
+ <RegistryKey Id="RegAuthCLSIDCategories" Root="HKCR" Key="CLSID\{78FA881E-5141-3B68-A76C-487871F4846A}\Implemented Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" />
</Component>
</Directory>
</Directory>
View
@@ -66,10 +66,8 @@ Global
{1DA8F5AA-2EE1-4204-A72F-0373BF541395}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DA8F5AA-2EE1-4204-A72F-0373BF541395}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DA8F5AA-2EE1-4204-A72F-0373BF541395}.Release|Any CPU.Build.0 = Release|Any CPU
- {8E2E9431-3FD1-41E9-97CF-CC96DD32386F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8E2E9431-3FD1-41E9-97CF-CC96DD32386F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8E2E9431-3FD1-41E9-97CF-CC96DD32386F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8E2E9431-3FD1-41E9-97CF-CC96DD32386F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8E2E9431-3FD1-41E9-97CF-CC96DD32386F}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {8E2E9431-3FD1-41E9-97CF-CC96DD32386F}.Release|Any CPU.ActiveCfg = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

0 comments on commit ab1e3a6

Please sign in to comment.