zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Virtuworks 2015-05-25 15:07:17 -04:00
commit d879aa44b0
11 changed files with 276 additions and 58109 deletions
Download patch file Download diff file Expand all files Collapse all files

45307
WebsitePanel/Database/wix_install_db.sql
View file

File diff suppressed because it is too large Load diff

12622
WebsitePanel/Database/wix_update_db.sql
View file

File diff suppressed because it is too large Load diff

17
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/RestrictedTraceAssertion.cs
View file

@ -112,6 +112,15 @@ namespace WebsitePanel.EnterpriseServer
filename = file;
}
void stripContent(XmlElement el, String tagName)
{
XmlNodeList passwords = el.GetElementsByTagName(tagName);
for (int i = 0; i < passwords.Count; ++i)
{
XmlNode node = passwords.Item(i);
node.InnerXml = "*****";
}
}
public override SoapFilterResult ProcessMessage(SoapEnvelope envelope)
{
XmlDocument dom = null;
@ -137,12 +146,16 @@ namespace WebsitePanel.EnterpriseServer
}
XmlNode newNode = dom.ImportNode(envelope.DocumentElement, true);
XmlNodeList passwords = (newNode as XmlElement).GetElementsByTagName("password");
XmlElement el = newNode as XmlElement;
stripContent(el, "password");
stripContent(el, "Password");
stripContent(el, "AnonymousUserPassword");
/* XmlNodeList passwords = (newNode as XmlElement).GetElementsByTagName("password");
for (int i = 0; i < passwords.Count; ++i)
{
XmlNode node = passwords.Item(i);
node.InnerXml = "*****";
}
} */
rootNode.AppendChild(newNode);

32
WebsitePanel/build.xml
View file

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Version>2.1.0</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion>
@ -617,7 +617,6 @@
<!-- Compile and deploy Setup.dll -->
<Target Name="CreateSetupDLL" DependsOnTargets="ScriptEnterpriseServerDatabase">
<!-- Compile Setup.dll -->
<MSBuild Projects="$(SetupTrunkFolder)\Sources\WebsitePanel.Installer.sln" Properties="Configuration=$(BuildConfiguration)" />
@ -649,8 +648,37 @@
<Copy SourceFiles="$(SetupBuildFolder)\setup.dll" DestinationFolder="$(StandaloneInstall)\Setup" />
<Copy SourceFiles="$(SetupBuildFolder)\setup.pdb" DestinationFolder="$(StandaloneInstall)\Setup" Condition="'$(BuildConfiguration)' == 'Debug'" />
</Target>
<UsingTask TaskName="RegExpReplace" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<Path ParameterType="System.String" Required="true" />
<Pattern ParameterType="System.String" Required="true" />
<Replacement ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.Text.RegularExpressions"/>
<Code Type="Fragment" Language="cs">
<![CDATA[
var Text = File.ReadAllText(Path);
var RegExp = new Regex(Pattern);
Text = RegExp.Replace(Text, Replacement);
File.WriteAllText(Path, Text);
]]>
</Code>
</Task>
</UsingTask>
<Target Name='Demo' >
<TokenReplace Path="C:\Project\Target.config" Token="$MyToken$" Replacement="MyValue"/>
</Target>
<Target Name="CreateStandaloneFullMsi" DependsOnTargets="CreateSetupDLL">
<Copy SourceFiles="$(TrunkFolder)\Database\install_db.sql" DestinationFiles="$(DatabaseFolder)\wix_install_db.sql" />
<Copy SourceFiles="$(UpdateFolder)\update_db.sql" DestinationFiles="$(DatabaseFolder)\wix_update_db.sql" />
<RegExpReplace Path="$(DatabaseFolder)\wix_install_db.sql" Pattern="USE \[\${install\.database}\]" Replacement="-- WiX" />
<RegExpReplace Path="$(DatabaseFolder)\wix_update_db.sql" Pattern="USE \[\${install\.database}\]" Replacement="-- WiX" />
<MSBuild Projects='$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.WIXInstaller\WebsitePanel.WIXInstaller.csproj' Properties='Configuration=$(BuildConfiguration)' Targets='Build' />
<MSBuild Projects='$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIXInstaller\Setup.WIXInstaller.wixproj' Properties='Configuration=$(BuildConfiguration)' Targets='Build'>
<Output TaskParameter="TargetOutputs" ItemName="StandaloneFullMsi" />
</MSBuild>