Merge with 4.9.0
This commit is contained in:
shannon@ShandemVaio
@@ -165,70 +165,9 @@
|
||||
|
||||
<Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
|
||||
<!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
|
||||
<MSBuild Projects="..\src\umbraco.presentation\umbraco.presentation.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
|
||||
<MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
|
||||
</MSBuild>
|
||||
|
||||
<!--
|
||||
Now, because of all the circular dependencies we need to build those projects and have them dump their DLLs/assets out to the same folder. Really wish this wasn't the case!
|
||||
These are: umbraco.editorControls umbraco.webservices umbraco.MacroEngines
|
||||
|
||||
Each of these projects has a post build to put their stuff in the correct location based on the solution and unfortunately for us each
|
||||
of these projects references the web application! So if we specify an OutDir parameter it will also trigger a web deploy and chuck another
|
||||
website output in bin/_PublishedWebSites folder. we cannot disable this: http://social.msdn.microsoft.com/forums/en-US/tfsbuild/thread/3ec642ad-2e6d-424c-891a-62f6409da62a/
|
||||
so we need to just build the project 'in-place' then copy its output to the SolutionBinFolder
|
||||
-->
|
||||
|
||||
<!-- MACRO ENGINES -->
|
||||
<Message Text="Compiling MacroEngines project" Importance="high" />
|
||||
<MSBuild Projects="..\src\umbraco.MacroEngines\umbraco.MacroEngines.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
|
||||
</MSBuild>
|
||||
<ItemGroup>
|
||||
<MacroEngineDll Include="..\src\umbraco.MacroEngines\bin\$(BuildConfiguration)\umbraco.MacroEngines.dll"/>
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(MacroEngineDll)"
|
||||
DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
|
||||
<Copy SourceFiles="@(MacroEngineDll)"
|
||||
DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
|
||||
|
||||
<!-- EDITOR CONTROLS -->
|
||||
<Message Text="Compiling editorControls project" Importance="high" />
|
||||
<MSBuild Projects="..\src\umbraco.editorControls\umbraco.editorControls.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
|
||||
</MSBuild>
|
||||
<ItemGroup>
|
||||
<EditorControlsDll Include="..\src\umbraco.editorControls\bin\$(BuildConfiguration)\umbraco.editorControls.dll"/>
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(EditorControlsDll)"
|
||||
DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
|
||||
<Copy SourceFiles="@(EditorControlsDll)"
|
||||
DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
|
||||
|
||||
<!-- WEBSERVICES -->
|
||||
<Message Text="Compiling webservices project" Importance="high" />
|
||||
<MSBuild Projects="..\src\umbraco.webservices\umbraco.webservices.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
|
||||
</MSBuild>
|
||||
<ItemGroup>
|
||||
<WebServicesDll Include="..\src\umbraco.webservices\bin\$(BuildConfiguration)\umbraco.webservices.dll"/>
|
||||
<WebServicesASMX Include="..\src\umbraco.webservices\*.asmx"/>
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(WebServicesDll)"
|
||||
DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
|
||||
<Copy SourceFiles="@(WebServicesDll)"
|
||||
DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
|
||||
<Copy SourceFiles="@(WebServicesASMX)"
|
||||
DestinationFolder="$(WebAppFolder)\umbraco\webservices\api" OverwriteReadOnlyFiles="True"/>
|
||||
|
||||
<!-- SQLCE4UMBRACO -->
|
||||
<!--<Message Text="Compiling SQLCE4Umbraco project" Importance="high" />
|
||||
<MSBuild Projects="..\src\SQLCE4Umbraco\SQLCE4Umbraco.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
|
||||
</MSBuild>
|
||||
<ItemGroup>
|
||||
<SQLCE4UmbracoDll Include="..\src\SQLCE4Umbraco\bin\$(BuildConfiguration)\SQLCE4Umbraco.dll" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(SQLCE4UmbracoDll)"
|
||||
DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
|
||||
<Copy SourceFiles="@(SQLCE4UmbracoDll)"
|
||||
DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>-->
|
||||
|
||||
<!-- DONE -->
|
||||
<Message Text="Finished compiling projects" Importance="high" />
|
||||
</Target>
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
<OldToolsVersion>4.0</OldToolsVersion>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile />
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<OutputPath>bin\</OutputPath>
|
||||
@@ -199,6 +200,14 @@
|
||||
<Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
|
||||
<Name>SqlCE4Umbraco</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\umbraco.editorControls\umbraco.editorControls.csproj">
|
||||
<Project>{255F5DF1-4E43-4758-AC05-7A0B68EB021B}</Project>
|
||||
<Name>umbraco.editorControls</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\umbraco.MacroEngines\umbraco.MacroEngines.csproj">
|
||||
<Project>{89C09045-1064-466B-B94A-DB3AFE2A5853}</Project>
|
||||
<Name>umbraco.MacroEngines</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\umbraco.macroRenderings\umbraco.macroRenderings.csproj">
|
||||
<Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
|
||||
<Name>umbraco.macroRenderings</Name>
|
||||
@@ -225,6 +234,10 @@
|
||||
<Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\umbraco.webservices\umbraco.webservices.csproj">
|
||||
<Project>{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}</Project>
|
||||
<Name>umbraco.webservices</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
|
||||
<Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
|
||||
<Name>umbraco.presentation</Name>
|
||||
@@ -293,10 +306,12 @@
|
||||
<None Include="umbraco\config\create\UI.Release.xml">
|
||||
<DependentUpon>UI.xml</DependentUpon>
|
||||
</None>
|
||||
<Content Include="umbraco\config\lang\he.xml" />
|
||||
<Content Include="umbraco\config\lang\ja.xml" />
|
||||
<Content Include="umbraco\config\lang\pl.xml" />
|
||||
<Content Include="umbraco\config\lang\pt.xml" />
|
||||
<Content Include="umbraco\config\lang\se.xml" />
|
||||
<Content Include="umbraco\config\lang\zh.xml" />
|
||||
<Content Include="umbraco\config\lang\zh.xml" />
|
||||
<Content Include="umbraco\controls\Tree\CustomTreeService.asmx" />
|
||||
<Content Include="umbraco\developer\RelationTypes\EditRelationType.aspx" />
|
||||
<Content Include="umbraco\developer\RelationTypes\Images\Bidirectional.png" />
|
||||
@@ -323,13 +338,24 @@
|
||||
<Content Include="umbraco\plugins\uGoLive\run.png" />
|
||||
<Content Include="umbraco\plugins\uGoLive\throbber.gif" />
|
||||
<Content Include="umbraco\plugins\uGoLive\tick.png" />
|
||||
<Content Include="umbraco\webservices\api\DocumentService.asmx" />
|
||||
<Content Include="umbraco\webservices\api\FileService.asmx" />
|
||||
<Content Include="umbraco\webservices\api\MaintanceService.asmx" />
|
||||
<Content Include="umbraco\webservices\api\MediaService.asmx" />
|
||||
<Content Include="umbraco\webservices\api\MemberService.asmx" />
|
||||
<Content Include="umbraco\webservices\api\StylesheetService.asmx" />
|
||||
<Content Include="umbraco\webservices\api\TemplateService.asmx" />
|
||||
<Content Include="umbraco_client\tinymce3\langs\en.js" />
|
||||
<Content Include="umbraco_client\tinymce3\langs\he.js" />
|
||||
<Content Include="umbraco_client\tinymce3\langs\ja.js" />
|
||||
<Content Include="umbraco_client\tinymce3\license.txt" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\css\advhr.css" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\editor_plugin.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\js\rule.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advhr\rule.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\css\advimage.css" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\editor_plugin.js" />
|
||||
@@ -338,11 +364,15 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\img\sample.gif" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\js\image.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advimage\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\css\advlink.css" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\editor_plugin.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\js\advlink.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlink\link.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlist\editor_plugin.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\advlist\editor_plugin_src.js" />
|
||||
@@ -380,6 +410,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\emotions\img\smiley-yell.gif" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\emotions\js\emotions.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\emotions\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\emotions\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\emotions\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\example\dialog.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\example\editor_plugin.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\example\editor_plugin_src.js" />
|
||||
@@ -395,6 +427,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullpage\fullpage.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullpage\js\fullpage.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullscreen\editor_plugin.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullscreen\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\fullscreen\fullscreen.htm" />
|
||||
@@ -433,7 +467,16 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\js\embed.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\js\media.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\da_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\de_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\es_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\fr_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\it_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\ko_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\nl_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\no_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\langs\sv_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\media.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\media\moxieplayer.swf" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\nonbreaking\editor_plugin.js" />
|
||||
@@ -447,6 +490,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\js\pastetext.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\js\pasteword.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\pastetext.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\paste\pasteword.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\preview\editor_plugin.js" />
|
||||
@@ -463,6 +508,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\searchreplace\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\searchreplace\js\searchreplace.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\searchreplace\searchreplace.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\spellchecker\css\content.css" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\spellchecker\editor_plugin.js" />
|
||||
@@ -473,6 +520,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\js\props.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\props.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\style\readme.txt" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\tabfocus\editor_plugin.js" />
|
||||
@@ -488,6 +537,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\js\row.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\js\table.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\merge_cells.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\row.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\table\table.htm" />
|
||||
@@ -497,6 +548,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\template\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\template\js\template.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\template\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\template\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\template\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\template\template.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracocontextmenu\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracocss\dialog.htm" />
|
||||
@@ -508,15 +561,23 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracoimg\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracoimg\js\image.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracolink\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracolink\js\umbracolink.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracolink\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracolink\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracolink\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\dialog.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\img\insMacro.gif" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\js\dialog.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\en.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\he.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\ja.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracopaste\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\umbracoshortcut\editor_plugin_src.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\visualblocks\css\visualblocks.css" />
|
||||
@@ -544,6 +605,8 @@
|
||||
<Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\js\element_common.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\js\ins.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\langs\en_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\langs\he_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\langs\ja_dlg.js" />
|
||||
<Content Include="umbraco_client\tinymce3\themes\advanced\about.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\themes\advanced\anchor.htm" />
|
||||
<Content Include="umbraco_client\tinymce3\themes\advanced\charmap.htm" />
|
||||
@@ -1725,6 +1788,7 @@
|
||||
<Folder Include="macroScripts\" />
|
||||
<Folder Include="masterpages\" />
|
||||
<Folder Include="media\" />
|
||||
<Folder Include="scripts\" />
|
||||
<Folder Include="usercontrols\" />
|
||||
<Folder Include="xslt\" />
|
||||
</ItemGroup>
|
||||
@@ -1745,7 +1809,16 @@ xcopy "$(ProjectDir)"..\..\lib\SQLCE4\x86\*.* "$(TargetDir)x86\" /Y /F /E /D</Po
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
<WebProjectProperties>
|
||||
<SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
|
||||
<UseIIS>True</UseIIS>
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>61637</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:61637/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
</CustomServerUrl>
|
||||
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
||||
</WebProjectProperties>
|
||||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
|
||||
@@ -1 +1 @@
|
||||
<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class=umbraco.webservices.documents.documentService %>
|
||||
<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class="umbraco.webservices.documents.documentService" %>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,136 +0,0 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Web;
|
||||
using System.Web.SessionState;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using System.Web.UI.HtmlControls;
|
||||
using System.Collections.Specialized;
|
||||
using umbraco.IO;
|
||||
using umbraco.cms.businesslogic.installer;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace umbraco.presentation.install
|
||||
{
|
||||
/// <summary>
|
||||
/// Summary description for _default.
|
||||
/// </summary>
|
||||
public partial class _default : BasePages.BasePage
|
||||
{
|
||||
|
||||
private string _installStep = "";
|
||||
public string currentStepClass = "";
|
||||
|
||||
protected void Page_Load(object sender, System.EventArgs e)
|
||||
{
|
||||
// use buffer, so content isn't sent until it's ready (minimizing the blank screen experience)
|
||||
//Response.Buffer = true;
|
||||
rp_steps.DataSource = InstallerSteps().Values;
|
||||
rp_steps.DataBind();
|
||||
}
|
||||
|
||||
|
||||
private void loadContent(InstallerStep currentStep)
|
||||
{
|
||||
PlaceHolderStep.Controls.Clear();
|
||||
PlaceHolderStep.Controls.Add(new System.Web.UI.UserControl().LoadControl(IOHelper.ResolveUrl( currentStep.UserControl ) ));
|
||||
step.Value = currentStep.Alias;
|
||||
currentStepClass = currentStep.Alias;
|
||||
}
|
||||
|
||||
int stepCounter = 0;
|
||||
protected void bindStep(object sender, RepeaterItemEventArgs e) {
|
||||
|
||||
if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item) {
|
||||
InstallerStep i = (InstallerStep)e.Item.DataItem;
|
||||
|
||||
if (!i.HideFromNavigation) {
|
||||
Literal _class = (Literal)e.Item.FindControl("lt_class");
|
||||
Literal _name = (Literal)e.Item.FindControl("lt_name");
|
||||
|
||||
if (i.Alias == currentStepClass)
|
||||
_class.Text = "active";
|
||||
|
||||
stepCounter++;
|
||||
_name.Text = (stepCounter).ToString() + " - " + i.Name;
|
||||
} else
|
||||
e.Item.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void GotoNextStep(string currentStep)
|
||||
{
|
||||
InstallerStep _s = InstallerSteps().GotoNextStep(currentStep);
|
||||
Response.Redirect("?installStep=" + _s.Alias);
|
||||
}
|
||||
|
||||
public void GotoLastStep()
|
||||
{
|
||||
InstallerStep _s = InstallerSteps().Get("theend");
|
||||
Response.Redirect("?installStep=" + _s.Alias);
|
||||
}
|
||||
|
||||
|
||||
#region Web Form Designer generated code
|
||||
override protected void OnInit(EventArgs e)
|
||||
{
|
||||
InitializeComponent();
|
||||
base.OnInit(e);
|
||||
|
||||
_installStep = helper.Request("installStep");
|
||||
InstallerStep _s;
|
||||
|
||||
//if this is not an upgrade we will log in with the default user.
|
||||
if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim())) {
|
||||
try {
|
||||
ensureContext();
|
||||
} catch {
|
||||
Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl));
|
||||
}
|
||||
|
||||
//set the first step to upgrade.
|
||||
// if (string.IsNullOrEmpty(_installStep))
|
||||
// _installStep = "upgrade";
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(_installStep))
|
||||
_s = InstallerSteps()["welcome"];
|
||||
else
|
||||
_s = InstallerSteps()[_installStep];
|
||||
|
||||
loadContent(_s);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
private static InstallerStepCollection InstallerSteps()
|
||||
{
|
||||
InstallerStepCollection ics = new InstallerStepCollection();
|
||||
ics.Add(new install.steps.Definitions.Welcome());
|
||||
ics.Add(new install.steps.Definitions.License());
|
||||
ics.Add(new install.steps.Definitions.FilePermissions());
|
||||
ics.Add(new install.steps.Definitions.Database());
|
||||
ics.Add(new install.steps.Definitions.DefaultUser());
|
||||
ics.Add( new install.steps.Definitions.Skinning() );
|
||||
ics.Add(new install.steps.Definitions.WebPi());
|
||||
ics.Add(new install.steps.Definitions.TheEnd());
|
||||
return ics;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
148
src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs
Normal file
148
src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs
Normal file
@@ -0,0 +1,148 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Web;
|
||||
using System.Web.SessionState;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using System.Web.UI.HtmlControls;
|
||||
using System.Collections.Specialized;
|
||||
using umbraco.IO;
|
||||
using umbraco.cms.businesslogic.installer;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace umbraco.presentation.install
|
||||
{
|
||||
/// <summary>
|
||||
/// Summary description for _default.
|
||||
/// </summary>
|
||||
public partial class _default : BasePages.BasePage
|
||||
{
|
||||
|
||||
private string _installStep = "";
|
||||
public string currentStepClass = "";
|
||||
|
||||
protected void Page_Load(object sender, System.EventArgs e)
|
||||
{
|
||||
// use buffer, so content isn't sent until it's ready (minimizing the blank screen experience)
|
||||
//Response.Buffer = true;
|
||||
rp_steps.DataSource = InstallerSteps().Values;
|
||||
rp_steps.DataBind();
|
||||
}
|
||||
|
||||
|
||||
private void loadContent(InstallerStep currentStep)
|
||||
{
|
||||
PlaceHolderStep.Controls.Clear();
|
||||
PlaceHolderStep.Controls.Add(new System.Web.UI.UserControl().LoadControl(IOHelper.ResolveUrl(currentStep.UserControl)));
|
||||
step.Value = currentStep.Alias;
|
||||
currentStepClass = currentStep.Alias;
|
||||
}
|
||||
|
||||
int stepCounter = 0;
|
||||
protected void bindStep(object sender, RepeaterItemEventArgs e)
|
||||
{
|
||||
|
||||
if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item)
|
||||
{
|
||||
InstallerStep i = (InstallerStep)e.Item.DataItem;
|
||||
|
||||
if (!i.HideFromNavigation)
|
||||
{
|
||||
Literal _class = (Literal)e.Item.FindControl("lt_class");
|
||||
Literal _name = (Literal)e.Item.FindControl("lt_name");
|
||||
|
||||
if (i.Alias == currentStepClass)
|
||||
_class.Text = "active";
|
||||
|
||||
stepCounter++;
|
||||
_name.Text = (stepCounter).ToString() + " - " + i.Name;
|
||||
}
|
||||
else
|
||||
e.Item.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void GotoNextStep(string currentStep)
|
||||
{
|
||||
InstallerStep _s = InstallerSteps().GotoNextStep(currentStep);
|
||||
Response.Redirect("?installStep=" + _s.Alias);
|
||||
}
|
||||
|
||||
public void GotoLastStep()
|
||||
{
|
||||
InstallerStep _s = InstallerSteps().Get("theend");
|
||||
Response.Redirect("?installStep=" + _s.Alias);
|
||||
}
|
||||
|
||||
|
||||
#region Web Form Designer generated code
|
||||
override protected void OnInit(EventArgs e)
|
||||
{
|
||||
InitializeComponent();
|
||||
base.OnInit(e);
|
||||
|
||||
_installStep = helper.Request("installStep");
|
||||
InstallerStep _s;
|
||||
|
||||
//if this is not an upgrade we will log in with the default user.
|
||||
if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim()))
|
||||
{
|
||||
try
|
||||
{
|
||||
ensureContext();
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl));
|
||||
}
|
||||
|
||||
//set the first step to upgrade.
|
||||
// if (string.IsNullOrEmpty(_installStep))
|
||||
// _installStep = "upgrade";
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(_installStep))
|
||||
_s = InstallerSteps()["welcome"];
|
||||
else
|
||||
_s = InstallerSteps()[_installStep];
|
||||
|
||||
loadContent(_s);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
private static InstallerStepCollection InstallerSteps()
|
||||
{
|
||||
InstallerStepCollection ics = new InstallerStepCollection();
|
||||
ics.Add(new install.steps.Definitions.Welcome());
|
||||
ics.Add(new install.steps.Definitions.License());
|
||||
ics.Add(new install.steps.Definitions.FilePermissions());
|
||||
ics.Add(new install.steps.Definitions.Database());
|
||||
ics.Add(new install.steps.Definitions.DefaultUser());
|
||||
ics.Add(new install.steps.Definitions.Skinning());
|
||||
ics.Add(new install.steps.Definitions.WebPi());
|
||||
ics.Add(new install.steps.Definitions.TheEnd());
|
||||
return ics;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user