Merge branch 'release/3.816.0'

VirtoCommerce · Jun 4, 2024 · a0251f4 · a0251f4
2 parents 347c6d8 + 3094d5a
commit a0251f4
Show file tree

Hide file tree

Showing 16 changed files with 6,685 additions and 113 deletions.
diff --git a/.github/workflows/module-sample-ci.yml b/.github/workflows/module-sample-ci.yml
@@ -1,4 +1,4 @@
-# v1.0.1
+# v1.1.0
 name: Module Sample CI
 
 on:
@@ -17,7 +17,7 @@ jobs:
   ci:
     strategy:
       matrix:
-       projectName: ['SampleModule.Web']
+       projectName: ['OrdersModule2.Web']
 
     if: ${{ github.actor != 'dependabot[bot]' && (github.event.pull_request.head.repo.full_name == github.repository || github.event.pull_request.head.repo.full_name == '') }}  # Check that PR not from forked repo and not from Dependabot
     runs-on: ubuntu-latest
@@ -44,12 +44,18 @@ jobs:
         run: |
           echo "RELEASE_STATUS=true" >> $GITHUB_ENV
 
-      - name: Set up JDK 11 for dotnet-sonarscanner #Sonar stop accepting Java versions less than 11
-        uses: actions/setup-java@v1
+      - name: Set up Node 20
+        uses: actions/setup-node@v4
         with:
-          java-version: 1.11
+            node-version: '20'
 
-      - uses: actions/checkout@v2
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -165,7 +171,8 @@ jobs:
           echo "Jira Upload Build Info response: ${{ steps.push_build_info_to_jira.outputs.response }}"
 
   deploy:
-    if: ${{ github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch' }}
+    if: false
+    #if: ${{ github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch' }}
     needs: ci
     runs-on: ubuntu-latest
     strategy:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.815.0</VersionPrefix>
+    <VersionPrefix>3.816.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/...ocalizations/en.VirtoCommerce.Orders.json → ...calizations/en.VirtoCommerce.Orders2.json b/...ocalizations/en.VirtoCommerce.Orders.json → ...calizations/en.VirtoCommerce.Orders2.json
diff --git a/...ocalizations/ru.VirtoCommerce.Orders.json → ...calizations/ru.VirtoCommerce.Orders2.json b/...ocalizations/ru.VirtoCommerce.Orders.json → ...calizations/ru.VirtoCommerce.Orders2.json
diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj
@@ -9,10 +9,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.825.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.OrdersModule.Core\VirtoCommerce.OrdersModule.Core.csproj" />
     <ProjectReference Include="..\..\src\VirtoCommerce.OrdersModule.Data\VirtoCommerce.OrdersModule.Data.csproj" />
-    <ProjectReference Include="..\..\src\VirtoCommerce.OrdersModule.Web\VirtoCommerce.OrdersModule.Web.csproj" />
   </ItemGroup>
 </Project>