Skip to content

Commit d5dd9ee

Browse files
muratcakirmuratcakir
committed
Updated all BundleTransformer packages and optimized build process
1 parent e24dff0 commit d5dd9ee

21 files changed

Lines changed: 107 additions & 87 deletions

File tree

‎SmartStoreNET.Tasks.Targets‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<MsBuildTasksFolder>$(RootFolder)\buildtasks</MsBuildTasksFolder>
2020
<ArtifactsFolder>$(RootFolder)\artifacts</ArtifactsFolder>
2121
<SqlCeFolder>$(LibFolder)\sqlce</SqlCeFolder>
22-
<V8Folder>$(LibFolder)\ClearScript.V8</V8Folder>
22+
<Msvcp140Folder>$(LibFolder)\msvcp140</Msvcp140Folder>
2323
<SourceArtifactFolder>$(ArtifactsFolder)\Source</SourceArtifactFolder>
2424
<MsDeployArtifactFolder>$(ArtifactsFolder)\MsDeploy</MsDeployArtifactFolder>
2525
<GalleryArtifactFolder>$(ArtifactsFolder)\Gallery</GalleryArtifactFolder>
@@ -44,7 +44,7 @@
4444
<BuildPlatform Condition="$(BuildPlatform) == ''">x86</BuildPlatform>
4545

4646
<xVersion>$(BUILD_NUMBER)</xVersion>
47-
<Version>2.6.0</Version>
47+
<Version>3.0.0</Version>
4848
<ZipDirectory>$(StageFolder)</ZipDirectory>
4949
<ZipVersionFileSuffix Condition="$(Version) != ''">.$(Version)</ZipVersionFileSuffix>
5050
<ZipVersionFileSuffix Condition="$(Version) == ''"></ZipVersionFileSuffix>
@@ -103,9 +103,8 @@
103103
<UploadedImages Include="$(WebFolder)\Media\uploaded\**\*" />
104104
<SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\**\*"/>
105105
<SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\**\*"/>
106-
<V8-Libs Include="$(V8Folder)\lib\**\*"/>
107-
<V8-Native-Binaries-x86 Include="$(V8Folder)\Native\x86\**\*"/>
108-
<V8-Native-Binaries-amd64 Include="$(V8Folder)\Native\amd64\**\*"/>
106+
<Msvcp140-Binaries-x86 Include="$(Msvcp140Folder)\x86\**\*"/>
107+
<Msvcp140-Binaries-amd64 Include="$(Msvcp140Folder)\amd64\**\*"/>
109108
</ItemGroup>
110109

111110
<!-- delete the build folder -->
@@ -157,10 +156,9 @@
157156
<Copy SourceFiles="@(SqlCe-Native-Binaries-x86)" DestinationFolder="$(StageFolder)\bin\x86\%(RecursiveDir)" />
158157
<Copy SourceFiles="@(SqlCe-Native-Binaries-amd64)" DestinationFolder="$(StageFolder)\bin\amd64\%(RecursiveDir)" />
159158

160-
<!-- copy ClearScript.V8 Javascript engine files -->
161-
<Copy SourceFiles="@(V8-Libs)" DestinationFolder="$(StageFolder)\bin\ClearScript.V8\%(RecursiveDir)" />
162-
<Copy SourceFiles="@(V8-Native-Binaries-x86)" DestinationFolder="$(StageFolder)\bin\x86\%(RecursiveDir)" />
163-
<Copy SourceFiles="@(V8-Native-Binaries-amd64)" DestinationFolder="$(StageFolder)\bin\amd64\%(RecursiveDir)" />
159+
<!-- copy Visual C++ runtime files -->
160+
<Copy SourceFiles="@(Msvcp140-Binaries-x86)" DestinationFolder="$(StageFolder)\bin\x86\%(RecursiveDir)" />
161+
<Copy SourceFiles="@(Msvcp140-Binaries-amd64)" DestinationFolder="$(StageFolder)\bin\amd64\%(RecursiveDir)" />
164162

165163
<!-- transform config files -->
166164
<TransformXml Source="$(TransformInputFile)" Transform="$(TransformFile)" Destination="$(TransformOutputFile)" />
@@ -177,7 +175,19 @@
177175
<XmlUpdate XmlFileName="$(TransformOutputFile)" XPath="/configuration/system.web/trace/@enabled" Value="false" />
178176
<XmlUpdate XmlFileName="$(TransformOutputFile)" XPath="/configuration/system.web/machineKey/@validationKey" Value="AutoGenerate" />
179177
<XmlUpdate XmlFileName="$(TransformOutputFile)" XPath="/configuration/system.web/machineKey/@decryptionKey" Value="AutoGenerate" />
180-
178+
179+
<!-- remove satellite dll folders gathered from nuget packages -->
180+
<CallTarget Targets="Remove-Satellites"/>
181+
</Target>
182+
183+
<Target Name="Remove-Satellites">
184+
<PropertyGroup>
185+
<BinDir>$(StageFolder)\bin</BinDir>
186+
</PropertyGroup>
187+
<ItemGroup>
188+
<SatelliteDirs Include="$(BinDir)\da;$(BinDir)\fi;$(BinDir)\ja;$(BinDir)\ko;$(BinDir)\mk;$(BinDir)\nl;$(BinDir)\pt;$(BinDir)\no;$(BinDir)\pl;$(BinDir)\ru-ru;$(BinDir)\sv;$(BinDir)\tr;$(BinDir)\uk;$(BinDir)\zh-CHS;$(BinDir)\zh-Hans;$(BinDir)\zh-Hant" />
189+
</ItemGroup>
190+
<RemoveDir Directories="@(SatelliteDirs)" />
181191
</Target>
182192

183193
<Target Name="Package-Zip">

‎src/Plugins/SmartStore.AmazonPay/web.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</dependentAssembly>
7878
<dependentAssembly>
7979
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
80-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
80+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
8181
</dependentAssembly>
8282
<dependentAssembly>
8383
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -131,6 +131,10 @@
131131
<assemblyIdentity name="LibSassHost" publicKeyToken="3e24e88796a38e46" culture="neutral" />
132132
<bindingRedirect oldVersion="0.0.0.0-0.5.2.0" newVersion="0.5.2.0" />
133133
</dependentAssembly>
134+
<dependentAssembly>
135+
<assemblyIdentity name="BundleTransformer.Core" publicKeyToken="973c344c93aac60d" culture="neutral" />
136+
<bindingRedirect oldVersion="0.0.0.0-1.9.138.0" newVersion="1.9.138.0" />
137+
</dependentAssembly>
134138
</assemblyBinding>
135139
</runtime>
136140
</configuration>

‎src/Plugins/SmartStore.Clickatell/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</dependentAssembly>
7575
<dependentAssembly>
7676
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
77-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
77+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.DevTools/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</dependentAssembly>
8383
<dependentAssembly>
8484
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
85-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
85+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
8686
</dependentAssembly>
8787
<dependentAssembly>
8888
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.DiscountRules/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</dependentAssembly>
7575
<dependentAssembly>
7676
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
77-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
77+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.FacebookAuth/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
81-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
81+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
8282
</dependentAssembly>
8383
<dependentAssembly>
8484
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.GoogleAnalytics/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</dependentAssembly>
7474
<dependentAssembly>
7575
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
76-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
76+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
7777
</dependentAssembly>
7878
<dependentAssembly>
7979
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.GoogleMerchantCenter/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</dependentAssembly>
7575
<dependentAssembly>
7676
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
77-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
77+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.OfflinePayment/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</dependentAssembly>
7575
<dependentAssembly>
7676
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
77-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
77+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Plugins/SmartStore.PayPal/web.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</dependentAssembly>
9191
<dependentAssembly>
9292
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
93-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
93+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
9494
</dependentAssembly>
9595
<dependentAssembly>
9696
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -144,6 +144,10 @@
144144
<assemblyIdentity name="LibSassHost" publicKeyToken="3e24e88796a38e46" culture="neutral" />
145145
<bindingRedirect oldVersion="0.0.0.0-0.5.2.0" newVersion="0.5.2.0" />
146146
</dependentAssembly>
147+
<dependentAssembly>
148+
<assemblyIdentity name="BundleTransformer.Core" publicKeyToken="973c344c93aac60d" culture="neutral" />
149+
<bindingRedirect oldVersion="0.0.0.0-1.9.138.0" newVersion="1.9.138.0" />
150+
</dependentAssembly>
147151
</assemblyBinding>
148152
</runtime>
149153
</configuration>

0 commit comments

Comments
 (0)