WIXBUG #4461 UriProtocol function is case sensitive #144

Merged
merged 2 commits into from May 23, 2015

Projects

None yet

4 participants

@amoravec
Contributor
amoravec commented Sep 2, 2014

Created tests for and corrected two issues with the UriProtocol function in dutil

protocol strings are now compared case insensitive and the ftp scheme was incorrectly being mapped to URI_PROCOL::URI_PROTOCOL_FILE

WIXBUG:4461 UriProtocol function is case sensitive

incorporated feedback from previous pull request, re-submit as a single commit

@amoravec amoravec Created tests for and corrected two issues with the UriProtocol funct…
…ion in dutil

protocol strings are now compared case insensitive and the ftp scheme was incorrectly being mapped to URI_PROCOL::URI_PROTOCOL_FILE

WIXBUG:4461 UriProtocol function is case sensitive

incorporated feedback from previous pull request, re-submit as a single commit
77c4e3b
@barnson
Member
barnson commented Sep 3, 2014

Before we could accept your pull request, we need an assignment agreement on file. Please see the details at http://wixtoolset.org/development/.

@amoravec
Contributor
amoravec commented Sep 4, 2014

I have signed and received confirmation I have completed the "'Outercurve Foundation Assignment Agreement - WiX'" on 8/15/2104.

@rseanhall rseanhall and 1 other commented on an outdated diff Sep 4, 2014
test/src/UnitTests/dutil/DUtilUnitTest.vcxproj
@@ -32,6 +32,11 @@
<ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc</ProjectAdditionalIncludeDirectories>
<ProjectAdditionalLinkLibraries>rpcrt4.lib;dutil.lib</ProjectAdditionalLinkLibraries>
</PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Link>
+ <AdditionalDependencies>urlmon.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@rseanhall
rseanhall Sep 4, 2014 Member

To stay consistent with the rest of the vcxproj's in WiX, please move these into the ProjectAdditionalLinkLibraries property. As it's written right now, it would fail to build in any configuration except Debug|Win32.

@amoravec
amoravec Sep 4, 2014 Contributor

@rseanhall You are correct, I'm pushing up the fix shortly...

@amoravec amoravec pull request feedback, moved additional dependencies to project wide …
…property, not specific to Debug|Win32 configuration
be629cb
@robmen robmen merged commit a90d0a4 into wixtoolset:develop May 23, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment