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

Items being checked-in:

Browse source 
- Updated list of files/folders to ignore;
 - Added full path to FCIV tool;
 - Updated settings of WebsitePanel.LocalizationToolkit solution output for Release/Debug;
 - Updated build.xml with relative paths to solutions;
 - Updated versioning for WebsitePanel.Templates project;
This commit is contained in:
ptsurbeleu 2011-07-13 23:15:40 -07:00
parent 61d1ba99a7
commit 1bd46a0b8a
9 changed files with 115 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.hgignore
View file

@ -12,5 +12,10 @@ bin
*.user
OrderBoxDomainsLib.dll
OrderBoxCoreLib.dll
WebsitePanel/Bin/*.*
WebsitePanel.Installer/Build/*
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/Ecommerce/Bin
WebsitePanel/Sources/Tools/WebsitePanel.LocalizationToolkit.Setup/Release
WebsitePanel/Deploy
WebsitePanel/Build
WebsitePanel.Installer/Build
WebsitePanel/Bin
msbuild.log

4
WebsitePanel.Installer/Resources/Compute SHA1.bat
View file

@ -1,6 +1,6 @@
@ECHO OFF
fciv.exe "..\Build\debug\WebsitePanelInstaller11.msi" -sha1 > "..\Build\debug\SHA1.log"
fciv.exe "..\Build\release\WebsitePanelInstaller11.msi" -sha1 > "..\Build\release\SHA1.log"
"C:\Program Files (x86)\Microsoft\FCIV\fciv.exe" "..\Build\debug\WebsitePanelInstaller12.msi" -sha1 > "..\Build\debug\SHA1.log"
"C:\Program Files (x86)\Microsoft\FCIV\fciv.exe" "..\Build\release\WebsitePanelInstaller12.msi" -sha1 > "..\Build\release\SHA1.log"
PAUSE

98
WebsitePanel.Installer/Sources/Setup/Setup.vdproj
View file

@ -33,18 +33,6 @@
}
"Entry"
{
"MsmKey" = "8:_225B2C569ED23E963FBD5A961A0D3B23"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_225B2C569ED23E963FBD5A961A0D3B23"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_3FE8A1704B90098231CE54C0A887C0F9"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
@ -58,7 +46,7 @@
"Entry"
{
"MsmKey" = "8:_3FE8A1704B90098231CE54C0A887C0F9"
"OwnerKey" = "8:_225B2C569ED23E963FBD5A961A0D3B23"
"OwnerKey" = "8:_EAE1EA76C9D31E75B8631E8C4E874282"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -81,6 +69,18 @@
}
"Entry"
{
"MsmKey" = "8:_EAE1EA76C9D31E75B8631E8C4E874282"
"OwnerKey" = "8:_05F59A142DD147798C90054A203C0EE9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_EAE1EA76C9D31E75B8631E8C4E874282"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1239E87E938248B1BAF9BF75C32D3EDC"
"MsmSig" = "8:_UNDEFINED"
@ -94,7 +94,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_225B2C569ED23E963FBD5A961A0D3B23"
"OwnerKey" = "8:_EAE1EA76C9D31E75B8631E8C4E874282"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -153,7 +153,7 @@
"DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE"
"OutputFilename" = "8:..\\..\\Build\\release\\WebsitePanelInstaller11.msi"
"OutputFilename" = "8:..\\..\\Build\\release\\WebsitePanelInstaller12.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@ -228,37 +228,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_225B2C569ED23E963FBD5A961A0D3B23"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:WebsitePanel.Installer.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_225B2C569ED23E963FBD5A961A0D3B23"
{
"Name" = "8:WebsitePanel.Installer.Core.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:WebsitePanel.Installer.Core.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3FE8A1704B90098231CE54C0A887C0F9"
{
"AssemblyRegister" = "3:1"
@ -350,6 +319,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EAE1EA76C9D31E75B8631E8C4E874282"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:WebsitePanel.Installer.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_EAE1EA76C9D31E75B8631E8C4E874282"
{
"Name" = "8:WebsitePanel.Installer.Core.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:WebsitePanel.Installer.Core.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
}
"FileType"
{
@ -418,7 +418,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WebsitePanel Installer"
"ProductCode" = "8:{09BCDF68-1964-4FC6-9570-9AB3B8512CF6}"
"PackageCode" = "8:{A8C23AB2-A737-4D67-8570-F2C5F1309672}"
"PackageCode" = "8:{9F1EEC33-EABE-4E8E-B1C5-5BECA8E9606D}"
"UpgradeCode" = "8:{2950A907-11E7-436C-86CE-049C414AFD08}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
@ -977,7 +977,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_05F59A142DD147798C90054A203C0EE9"
{
"SourcePath" = "8:..\\WebsitePanel.Installer\\obj\\Debug\\WebsitePanel.Installer.exe"
"SourcePath" = "8:..\\WebsitePanel.Installer\\obj\\Release\\WebsitePanel.Installer.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"
@ -1005,7 +1005,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1239E87E938248B1BAF9BF75C32D3EDC"
{
"SourcePath" = "8:..\\WebsitePanel.SilentInstaller\\obj\\x86\\Debug\\WebsitePanel.SilentInstaller.exe"
"SourcePath" = "8:..\\WebsitePanel.SilentInstaller\\obj\\x86\\Release\\WebsitePanel.SilentInstaller.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E742E59BFE4D43C59AA65A07792B89FB"

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer/App.config
View file

@ -9,7 +9,7 @@
<!-- Studio settings -->
<settings>
<add key="Log.FileName" value="WebsitePanel.Installer.log" />
<add key="Web.Service" value="http://www.websitepanel.net/Services/InstallerService-Beta.asmx" />
<add key="Web.Service" value="" />
<add key="Web.AutoCheck" value="False" />
<add key="Web.Proxy.UseProxy" value="false" />
<add key="Web.Proxy.Address" value="" />

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
View file

Binary file not shown.

86
WebsitePanel/Sources/Tools/WebsitePanel.LocalizationToolkit.Setup/Setup.vdproj
View file

@ -27,6 +27,12 @@
}
"Entry"
{
"MsmKey" = "8:_8C549ED5F222FD36F4A7A0E995BB9C3E"
"OwnerKey" = "8:_3B6BCC3083984F7B823C46F727669165"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_AFF04F444EB74D2BBF0FE4A6E9652FD5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@ -39,12 +45,6 @@
}
"Entry"
{
"MsmKey" = "8:_FCEB498C298F3B87E5937D817B53B518"
"OwnerKey" = "8:_3B6BCC3083984F7B823C46F727669165"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_3B6BCC3083984F7B823C46F727669165"
"MsmSig" = "8:_UNDEFINED"
@ -52,7 +52,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_FCEB498C298F3B87E5937D817B53B518"
"OwnerKey" = "8:_8C549ED5F222FD36F4A7A0E995BB9C3E"
"MsmSig" = "8:_UNDEFINED"
}
}
@ -63,7 +63,7 @@
"DisplayName" = "8:Debug"
"IsDebugOnly" = "11:TRUE"
"IsReleaseOnly" = "11:FALSE"
"OutputFilename" = "8:Debug\\WebsitePanelLocalizationToolkit10.msi"
"OutputFilename" = "8:Debug\\WebsitePanelLocalizationToolkit12.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@ -90,7 +90,7 @@
"DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE"
"OutputFilename" = "8:Release\\WebsitePanelLocalizationToolkit110.msi"
"OutputFilename" = "8:Release\\WebsitePanelLocalizationToolkit12.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@ -137,7 +137,7 @@
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
"FrameworkVersion" = "8:2.0.50727 "
"FrameworkVersion" = "8:2.0.50727 "
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=9832"
}
@ -165,6 +165,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8C549ED5F222FD36F4A7A0E995BB9C3E"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Ionic.Zip.Reduced, Version=1.8.4.28, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8C549ED5F222FD36F4A7A0E995BB9C3E"
{
"Name" = "8:Ionic.Zip.Reduced.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Ionic.Zip.Reduced.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A68C37AB7D6A4154AFCA98D0B81B8175"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AFF04F444EB74D2BBF0FE4A6E9652FD5"
{
"SourcePath" = "8:Banner.bmp"
@ -205,37 +236,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FCEB498C298F3B87E5937D817B53B518"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Ionic.Zip.Reduced, Version=1.8.4.28, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_FCEB498C298F3B87E5937D817B53B518"
{
"Name" = "8:Ionic.Zip.Reduced.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Ionic.Zip.Reduced.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A68C37AB7D6A4154AFCA98D0B81B8175"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
}
"FileType"
{
@ -326,7 +326,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WebsitePanel Localization Toolkit 1.2.0"
"ProductCode" = "8:{C409DC88-3751-4DF9-9EF1-56AD06C92319}"
"PackageCode" = "8:{73251356-07E6-4DCA-A815-A433A5528E27}"
"PackageCode" = "8:{137E8F55-5B1A-48B5-9C50-D2497F3E1357}"
"UpgradeCode" = "8:{5E387E28-5748-4BF2-BEEF-2A3AE3F43FC5}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
@ -866,7 +866,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3B6BCC3083984F7B823C46F727669165"
{
"SourcePath" = "8:..\\WebsitePanel.LocalizationToolkit\\obj\\Debug\\LocalizationToolkit.exe"
"SourcePath" = "8:..\\WebsitePanel.LocalizationToolkit\\obj\\Release\\LocalizationToolkit.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A68C37AB7D6A4154AFCA98D0B81B8175"

2
WebsitePanel/Sources/VersionInfo.cs
View file

@ -16,7 +16,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2011 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.39")]
[assembly: AssemblyFileVersion("1.2.0.38")]
[assembly: AssemblyInformationalVersion("1.2.0")]

3
WebsitePanel/Sources/WebsitePanel.Templates/WebsitePanel.Templates.csproj
View file

@ -66,6 +66,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersionInfo.cs">
<Link>VersionInfo.cs</Link>
</Compile>
<Compile Include="AST\BinaryExpression.cs" />
<Compile Include="AST\CallTemplateStatement.cs" />
<Compile Include="AST\ElseIfStatement.cs" />

15
WebsitePanel/build.xml
View file

@ -4,13 +4,12 @@
<Version>1.2.0.0</Version>
<FileVersion>1.2.0.38</FileVersion>
<VersionLabel>1.2.0</VersionLabel>
<ReleaseDate>2011-07-11</ReleaseDate>
<ReleaseDate>2011-07-13</ReleaseDate>
<BuildConfiguration>Release</BuildConfiguration>
<SourcesPath>https://websitepanel.svn.sourceforge.net/svnroot/websitepanel/WebsitePanel/Trunk</SourcesPath>
<RootFolder>C:\Backup\WebsitePanel</RootFolder>
<TrunkFolder>$(RootFolder)\Trunk</TrunkFolder>
<RootFolder>..</RootFolder>
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
<SetupTrunkFolder>C:\Backup\WebsitePanel.Installer\Trunk</SetupTrunkFolder>
<SetupTrunkFolder>$(RootFolder)\WebsitePanel.Installer</SetupTrunkFolder>
<SetupBuildFolder>$(SetupTrunkFolder)\Build\$(BuildConfiguration)</SetupBuildFolder>
<BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder>
@ -341,7 +340,11 @@
</Target>
<Target Name="ScriptEnterpriseServerDatabase" DependsOnTargets="CreateEnterpriseServerDatabase">
<Exec Command="$(MSDeployPath) -verb:sync -source:dbFullSql=&quot;$(MSDeployConnectionString)&quot; -dest:dbFullSql=&quot;$(DatabaseFolder)\install_db_temp.sql&quot;"/>
<ConvertToAbsolutePath Paths="$(DatabaseFolder)">
<Output TaskParameter="AbsolutePaths" PropertyName="DatabaseFolderAbsolute"/>
</ConvertToAbsolutePath>
<Exec Command="$(MSDeployPath) -verb:sync -source:dbFullSql=&quot;$(MSDeployConnectionString)&quot; -dest:dbFullSql=&quot;$(DatabaseFolderAbsolute)\install_db_temp.sql&quot;"/>
<Exec Command="copy $(TrunkFolder)\Resources\database_header.sql+$(DatabaseFolder)\install_db_temp.sql $(DatabaseFolder)\install_db.sql" />
<MakeDir Directories="$(EnterpriseServerInstall)\Setup"/>