Set 2.3.0 beta version (#569)

KrzysztofPajak · web-flow · commit ade7aa88f534 · 2025-02-11T19:37:39.000+01:00
* Update version to 2.3.0-beta

* Disable StaticWebAssets and Compression in multiple projects

StaticWebAssetsEnabled set to false in various project files, including:
- Authentication.Facebook.csproj
- Authentication.Google.csproj
- DiscountRules.Standard.csproj
- Payments.BrainTree.csproj
- Payments.CashOnDelivery.csproj
- Payments.StripeCheckout.csproj
- Shipping.ByWeight.csproj
- Shipping.FixedRateShipping.csproj
- Shipping.ShippingPoint.csproj
- Tax.CountryStateZip.csproj
- Tax.FixedRate.csproj
- Theme.Modern.csproj
- Widgets.FacebookPixel.csproj
- Widgets.GoogleAnalytics.csproj
- Widgets.Slider.csproj

CompressionEnabled set to false in:
- Grand.SharedUIResources.csproj
- Grand.Web.Admin.csproj
- Grand.Web.Vendor.csproj
- Grand.Web.csproj

* Braintree - Add CurrencyIsoCode to TransactionRequest

* Add ConfigurationManager and update StripeCheckout
diff --git 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
@@ -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>
diff --git 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
@@ -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
@@ -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
@@ -123,7 +123,7 @@ public async Task<ProcessPaymentResult> ProcessPayment(PaymentTransaction paymen
             Environment = useSandBox ? Environment.SANDBOX : Environment.PRODUCTION,
             MerchantId = merchantId,
             PublicKey = publicKey,
-            PrivateKey = privateKey
+            PrivateKey = privateKey,
         };
 
         //new transaction request
@@ -156,6 +156,7 @@ public async Task<ProcessPaymentResult> ProcessPayment(PaymentTransaction paymen
             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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" />
