Merge branch 'release/6.36.0'

VirtoCommerce · Jan 22, 2024 · 38e234d · 38e234d
2 parents 41b7afe + e08d3b1
commit 38e234d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,6 +45,17 @@ jobs:
 
     steps:
 
+    - name: Set up Node 18
+      uses: actions/setup-node@v3
+      with:
+          node-version: '18'
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
     - name: Set variables
       if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
@@ -61,7 +72,7 @@ jobs:
       run: |
         echo "BUILD_DOCKER=true" >> $GITHUB_ENV
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.35.0</VersionPrefix>
+    <VersionPrefix>6.36.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>