Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Set 2.3.0 beta version (#569)

Krzysztof Pajakade7aa88f534
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 05e9703a7..95f500b65 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -41,6 +41,7 @@
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.1" />
<PackageVersion Include="Braintree" Version="5.29.0" />
+ <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
<PackageVersion Include="System.Xml.XPath.XmlDocument" Version="4.7.0" />
<PackageVersion Include="Stripe.net" Version="47.3.0" />
diff --git a/src/Build/Grand.Common.props b/src/Build/Grand.Common.props
index c950b7cab..5a4556623 100644
--- a/src/Build/Grand.Common.props
+++ b/src/Build/Grand.Common.props
@@ -45,7 +45,7 @@
</ItemGroup>
<Target Name="SetVersion" BeforeTargets="PrepareForBuild">
<PropertyGroup>
- <Version>2.3.0-develop</Version>
+ <Version>2.3.0-beta</Version>
</PropertyGroup>
</Target>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
index bb65e0769..304873ed2 100644
--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csproj
index 6fc6320b5..261674f2d 100644
--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj
+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\Web\Grand.Web\Plugins\Authentication.Google</OutputPath>
diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
index bc15aaa85..e8be89b4b 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
+++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
index a75e38018..028f90911 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
@@ -123,7 +123,7 @@ public class BrainTreePaymentProvider : IPaymentProvider
Environment = useSandBox ? Environment.SANDBOX : Environment.PRODUCTION,
MerchantId = merchantId,
PublicKey = publicKey,
- PrivateKey = privateKey
+ PrivateKey = privateKey,
};
//new transaction request
@@ -156,6 +156,7 @@ public class BrainTreePaymentProvider : IPaymentProvider
PostalCode = customer.BillingAddress.ZipPostalCode
};
transactionRequest.BillingAddress = addressRequest;
+ transactionRequest.CurrencyIsoCode = paymentTransaction.CurrencyCode;
//transaction options request
var transactionOptionsRequest = new TransactionOptionsRequest {
diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj
index 38eb790fd..cde782f4c 100644
--- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj
+++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
index fc0c86b6c..198028a57 100644
--- a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
+++ b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj
index 02ab3a154..3501a7119 100644
--- a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj
+++ b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj
@@ -2,7 +2,8 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\Web\Grand.Web\Plugins\Payments.StripeCheckout\</OutputPath>
@@ -15,13 +16,14 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Stripe.net" />
+ <PackageReference Include="Stripe.net" />
</ItemGroup>
<Target Name="CopyFile" AfterTargets="AfterBuild">
<ItemGroup>
- <CopyFiles Include="$(NuGetPackageRoot)\stripe.net\47.3.0\lib\net8.0\*.*" />
- </ItemGroup>
+ <CopyFiles Include="$(NuGetPackageRoot)\stripe.net\47.3.0\lib\net8.0\*.*" />
+ <CopyFiles Include="$(NuGetPackageRoot)\newtonsoft.json\13.0.3\lib\net6.0\*.dll" />
+ </ItemGroup>
<Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Payments.StripeCheckout\" />
</Target>
diff --git a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
index a3cbada90..ab9f7e987 100644
--- a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
+++ b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj
index 335612949..5f05f2feb 100644
--- a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj
+++ b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
index 05157e61a..e8496425b 100644
--- a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
+++ b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
index 78923821d..93c278f6b 100644
--- a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
+++ b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
index 5012aaa32..24b252df6 100644
--- a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
+++ b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Plugins/Theme.Modern/Theme.Modern.csproj b/src/Plugins/Theme.Modern/Theme.Modern.csproj
index 61f878e77..45362f30c 100644
--- a/src/Plugins/Theme.Modern/Theme.Modern.csproj
+++ b/src/Plugins/Theme.Modern/Theme.Modern.csproj
@@ -2,7 +2,8 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\Web\Grand.Web\Plugins\Theme.Modern\</OutputPath>
diff --git a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj
index d38cab33e..0823655f9 100644
--- a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj
+++ b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj
index e129522e5..38840924a 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj
+++ b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
index 9db71ddab..721daf3b5 100644
--- a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
+++ b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Web/Grand.SharedUIResources/Grand.SharedUIResources.csproj b/src/Web/Grand.SharedUIResources/Grand.SharedUIResources.csproj
index 8be360d2c..71ef9af67 100644
--- a/src/Web/Grand.SharedUIResources/Grand.SharedUIResources.csproj
+++ b/src/Web/Grand.SharedUIResources/Grand.SharedUIResources.csproj
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\Build\Grand.Common.props" />
-
+ <PropertyGroup>
+ <CompressionEnabled>false</CompressionEnabled>
+ </PropertyGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
diff --git a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj
index 897a99644..de2d81400 100644
--- a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj
+++ b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj
@@ -8,6 +8,7 @@
<UseAppHost>false</UseAppHost>
<!--Set GenerateRuntimeConfigurationFiles as true when Admin panel is supposed to works independent-->
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
+ <CompressionEnabled>false</CompressionEnabled>
</PropertyGroup>
<ItemGroup>
<Content Include="Areas\**" CopyToPublishDirectory="Never" />
diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
index a2d0b1306..8aa1ae913 100644
--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
@@ -7,6 +7,7 @@
<PackageReference Include="Flurl.Http" />
<PackageReference Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
+ <PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" />
<PackageReference Include="Wangkanai.Detection" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
diff --git a/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj b/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj
index bd44fedb6..bbb3a4591 100644
--- a/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj
+++ b/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj
@@ -7,7 +7,8 @@
<UseAppHost>false</UseAppHost>
<!--Set GenerateRuntimeConfigurationFiles as true when Vendor panel is supposed to works independent-->
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
- </PropertyGroup>
+ <CompressionEnabled>false</CompressionEnabled>
+ </PropertyGroup>
<ItemGroup>
<Content Include="Areas\**" CopyToPublishDirectory="Never" />
<Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest" />
diff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csproj
index 2dc8e420b..85d10ff9e 100644
--- a/src/Web/Grand.Web/Grand.Web.csproj
+++ b/src/Web/Grand.Web/Grand.Web.csproj
@@ -14,6 +14,7 @@
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
<UserSecretsId>a2091e37-94a0-4446-8a5d-1d5c0835333a</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+ <CompressionEnabled>false</CompressionEnabled>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />