Merge pull request #1 from cvandeluitgaarden/develop

Develop
cvandeluitgaarden · Feb 16, 2016 · ad6cdcc · ad6cdcc
2 parents 693e5f4 + 3b1468d
commit ad6cdcc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/Sitecore.SharedSource.Wildcard.TDS/Sitecore.SharedSource.Wildcard.TDS.scproj b/src/Sitecore.SharedSource.Wildcard.TDS/Sitecore.SharedSource.Wildcard.TDS.scproj
@@ -12,26 +12,28 @@
     <UseWebConfigReplacement>false</UseWebConfigReplacement>
     <DeleteAppCodeCompiledFiles>true</DeleteAppCodeCompiledFiles>
     <LegacyFileReplacement>false</LegacyFileReplacement>
-    <SourceWebPhysicalPath>
-    </SourceWebPhysicalPath>
-    <SourceWebProject>
-    </SourceWebProject>
-    <SourceWebVirtualPath>
-    </SourceWebVirtualPath>
-    <SitecoreDatabase>
-    </SitecoreDatabase>
+    <SourceWebPhysicalPath>..\Sitecore.SharedSource.Wildcard</SourceWebPhysicalPath>
+    <SourceWebProject>{ba1901f1-4e62-49fc-9154-4ac6bb1f7811}|src\Sitecore.SharedSource.Wildcard\Sitecore.SharedSource.Wildcard.csproj</SourceWebProject>
+    <SourceWebVirtualPath>/Sitecore.SharedSource.Wildcard.csproj</SourceWebVirtualPath>
+    <SitecoreDatabase>master</SitecoreDatabase>
     <AssemblyName>Sitecore.SharedSource.Wildcard.TDS</AssemblyName>
     <Name>Sitecore.SharedSource.Wildcard.TDS</Name>
     <RootNamespace>Sitecore.SharedSource.Wildcard.TDS</RootNamespace>
+    <EnableCodeGeneration>false</EnableCodeGeneration>
+    <ManageRoles>False</ManageRoles>
+    <AssemblyStatus>Exclude</AssemblyStatus>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>.\bin\Debug\</OutputPath>
     <RecursiveDeployAction>Ignore</RecursiveDeployAction>
-    <SitecoreDeployFolder>E:\Data\Development\Sitecore\modules.qodecube.local\Website</SitecoreDeployFolder>
-    <SitecoreWebUrl>http://modules.qodecube.local/</SitecoreWebUrl>
+    <SitecoreDeployFolder>
+    </SitecoreDeployFolder>
+    <SitecoreWebUrl>
+    </SitecoreWebUrl>
     <SitecoreAccessGuid>fe55a408-0d67-4eb1-ac60-de3e027ff0f8</SitecoreAccessGuid>
     <InstallSitecoreConnector>True</InstallSitecoreConnector>
+    <DisableFileDeployment>False</DisableFileDeployment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>false</DebugSymbols>
@@ -92,5 +94,11 @@
       <ItemDeployment>AlwaysUpdate</ItemDeployment>
     </SitecoreItem>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Sitecore.SharedSource.Wildcard\Sitecore.SharedSource.Wildcard.csproj">
+      <Project>{ba1901f1-4e62-49fc-9154-4ac6bb1f7811}</Project>
+      <Name>Sitecore.SharedSource.Wildcard</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\HedgehogDevelopment\SitecoreProject\v9.0\HedgehogDevelopment.SitecoreProject.targets" />
 </Project>
diff --git a/src/Sitecore.SharedSource.Wildcard/WildcardProvider.cs b/src/Sitecore.SharedSource.Wildcard/WildcardProvider.cs
@@ -105,7 +105,7 @@ public static string GetWildCardItemRelativeSitecorePathFromUrl(string path, Ite
             return itemRelativePath;
         }
 
-        public static string GetWildcardItemUrl(Sitecore.Data.Items.Item wildcardItem, Item realItem, bool useDisplayName, UrlOptions urlOptions = null)
+        public static string GetWildcardItemUrl(Sitecore.Data.Items.Item wildcardItem, Item realItem, bool useDisplayName = false, UrlOptions urlOptions = null)
         {
             if (urlOptions == null)
             {