Skip to content

Commit 842ba08

Browse files
acoumbacoumb
authored
Merge pull request #243 from umbraco/bugfix/render-views-production-runtime
Update Shopify and Dynamics to exclude V8 rendering view.
2 parents 0843961 + 1affb0a commit 842ba08

File tree

14 files changed

+44
-48
lines changed

14 files changed

+44
-48
lines changed

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/Render/Products.cshtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@inherits Umbraco.Web.Mvc.UmbracoViewPage<List<Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels.ProductViewModel>>
1+
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<List<Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels.ProductViewModel>>
22

33
@if (Model != null)
44
{
@@ -13,6 +13,4 @@
1313
}
1414
}
1515
</dl>
16-
}
17-
18-
16+
}

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/Render/ProductsV9.cshtml renamed to ‎src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/RenderV8/Products.cshtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<List<Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels.ProductViewModel>>
1+
@inherits Umbraco.Web.Mvc.UmbracoViewPage<List<Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels.ProductViewModel>>
22

33
@if (Model != null)
44
{
@@ -13,4 +13,6 @@
1313
}
1414
}
1515
</dl>
16-
}
16+
}
17+
18+

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/package.manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Umbraco.Cms.Integrations.Commerce.Shopify",
3-
"version": "1.0.3",
3+
"version": "1.3.1",
44
"allowPackageTelemetry": true,
55
"javascript": [
66
"~/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/js/productPicker.controller.js",
@@ -11,4 +11,4 @@
1111
"css": [
1212
"~/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/css/shopify.css"
1313
]
14-
}
14+
}

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-

1+
using System;
2+
23
namespace Umbraco.Cms.Integrations.Commerce.Shopify
34
{
45
public static class Constants
@@ -15,9 +16,12 @@ public static class Constants
1516

1617
public static class RenderingComponent
1718
{
18-
public const string DefaultV8ViewPath = AppPluginFolderPath + "/Render/Products.cshtml";
19+
public const string DefaultViewPath = AppPluginFolderPath + "/Render/Products.cshtml";
20+
21+
public const string DefaultV8ViewPath = AppPluginFolderPath + "/RenderV8/Products.cshtml";
1922

20-
public const string DefaultV9ViewPath = AppPluginFolderPath + "/Render/ProductsV9.cshtml";
23+
[Obsolete("Use DefaultViewPath instead. This will be removed in a future version.")]
24+
public const string DefaultV9ViewPath = DefaultViewPath;
2125
}
2226

2327
public static class Configuration

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/Helpers/HtmlHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static class ShopifyHtmlExtensions
1919
#if NETCOREAPP
2020
public static IHtmlContent RenderShopifyProductsList(this IHtmlHelper<dynamic> htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")
2121
{
22-
return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultV9ViewPath : renderingViewPath, vm);
22+
return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultViewPath : renderingViewPath, vm);
2323
}
2424
#else
2525
public static IHtmlString RenderShopifyProductsList(this HtmlHelper htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageIconUrl></PackageIconUrl>
1111
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Commerce.Shopify</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
13-
<Version>1.3.0</Version>
13+
<Version>1.3.1</Version>
1414
<Authors>Umbraco HQ</Authors>
1515
<Company>Umbraco</Company>
1616
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/build/Umbraco.Cms.Integrations.Commerce.Shopify.targets

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
32
<PropertyGroup>
4-
<ShopifyPropertyEditorFiles>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\**\*.*</ShopifyPropertyEditorFiles>
3+
<ShopifyPropertyEditorFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\**\*.*</ShopifyPropertyEditorFilesPath>
54
</PropertyGroup>
65

7-
<Target Name="CopyShopifyPropertyEditorAssets" BeforeTargets="Build">
6+
<Target Name="CopyShopifyPropertyEditorAssets" BeforeTargets="BeforeBuild">
87
<ItemGroup>
9-
<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)" />
8+
<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFilesPath)" />
9+
<!-- Remove incompatible views based on TFM -->
10+
<ShopifyPropertyEditorFiles Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\Render\*.*" />
11+
<ShopifyPropertyEditorFiles Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*" />
1012
</ItemGroup>
11-
<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFiles) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
12-
<Copy
13-
SourceFiles="@(ShopifyPropertyEditorFiles)"
14-
DestinationFiles="@(ShopifyPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\%(RecursiveDir)%(Filename)%(Extension)')"
15-
SkipUnchangedFiles="true" />
16-
13+
<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFilesPath) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
14+
<Copy SourceFiles="@(ShopifyPropertyEditorFiles)" DestinationFiles="@(ShopifyPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
1715
</Target>
1816

1917
<Target Name="ClearShopifyPropertyEditorAssets" BeforeTargets="Clean">
2018
<ItemGroup>
2119
<ShopifyPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\" />
2220
</ItemGroup>
23-
<Message Text="Clear Shopify Property Editor data" Importance="high" />
24-
<RemoveDir Directories="@(ShopifyPropertyEditorDir)" />
21+
<Message Text="Clear old Shopify Property Editor data" Importance="high" />
22+
<RemoveDir Directories="@(ShopifyPropertyEditorDir)" />
2523
</Target>
26-
2724
</Project>

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<info>
44
<package>
55
<name>Umbraco.Cms.Integrations.Commerce.Shopify</name>
6-
<version>1.2.0</version>
6+
<version>1.3.1</version>
77
<iconUrl></iconUrl>
88
<licence url="https://opensource.org/licenses/MIT">MIT</licence>
99
<url>https://github.com/umbraco/Umbraco.Cms.Integrations</url>

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml renamed to ‎src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/RenderV8/DynamicsForm.cshtml

File renamed without changes.

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/package.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Umbraco.Cms.Integrations.Crm.Dynamics",
3-
"version": "1.3.6",
3+
"version": "1.3.7",
44
"allowPackageTelemetry": true,
55
"javascript": [
66
"~/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js",

0 commit comments

Comments
 (0)