-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
16 changed files
with
230 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # v3.200.24 | ||
| # v3.200.30 | ||
| name: Module CI | ||
|
|
||
| on: | ||
|
|
@@ -57,7 +57,7 @@ jobs: | |
| steps: | ||
|
|
||
| - name: Set up Node 18 | ||
| uses: actions/setup-node@v2 | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: '18' | ||
|
|
||
|
|
@@ -154,9 +154,9 @@ jobs: | |
| id: artifactUrl | ||
| run: | | ||
| if [ '${{ github.ref }}' = 'refs/heads/master' ]; then | ||
| echo ::set-output name=download_url::${{ steps.githubRelease.outputs.downloadUrl }} | ||
| echo "download_url=${{ steps.githubRelease.outputs.downloadUrl }}" >> $GITHUB_OUTPUT | ||
| else | ||
| echo ::set-output name=download_url::${{ steps.blobRelease.outputs.packageUrl }} | ||
| echo "download_url=${{ steps.blobRelease.outputs.packageUrl }}" >> $GITHUB_OUTPUT | ||
| fi; | ||
| - name: Create deployment matrix | ||
|
|
@@ -172,9 +172,9 @@ jobs: | |
| run: | | ||
| if [[ "${{ github.event.head_commit.message }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; | ||
| then | ||
| echo "::set-output name=result::false" | ||
| echo "result=false" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "::set-output name=result::true" | ||
| echo "result=true" >> $GITHUB_OUTPUT | ||
| fi | ||
| - name: Setup Git Credentials | ||
|
|
@@ -239,7 +239,7 @@ jobs: | |
| if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) || | ||
| (github.event_name == 'workflow_dispatch')}} | ||
| needs: 'ci' | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| with: | ||
| katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' | ||
| katalonRepoBranch: 'dev' | ||
|
|
@@ -259,7 +259,7 @@ jobs: | |
| (github.ref == 'refs/heads/dev')) && | ||
| github.event_name == 'push' }} | ||
| needs: ci | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| with: | ||
| releaseSource: module | ||
| moduleId: ${{ needs.ci.outputs.moduleId }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # v3.200.24 | ||
| # v3.200.30 | ||
| name: Release hotfix | ||
|
|
||
| on: | ||
|
|
@@ -12,12 +12,12 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| secrets: | ||
| sonarToken: ${{ secrets.SONAR_TOKEN }} | ||
|
|
||
| build: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| with: | ||
| uploadPackage: 'true' | ||
| uploadDocker: 'false' | ||
|
|
@@ -28,6 +28,8 @@ jobs: | |
|
|
||
| get-metadata: | ||
| runs-on: ubuntu-20.04 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} | ||
| outputs: | ||
| changelog: ${{ steps.changelog.outputs.changelog }} | ||
| steps: | ||
|
|
@@ -43,7 +45,7 @@ jobs: | |
| publish-github-release: | ||
| needs: | ||
| [build, test, get-metadata] | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| with: | ||
| fullKey: ${{ needs.build.outputs.packageFullKey }} | ||
| changeLog: '${{ needs.get-metadata.outputs.changeLog }}' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # v3.200.24 | ||
| # v3.200.30 | ||
| name: Publish nuget | ||
|
|
||
| on: | ||
|
|
@@ -12,12 +12,12 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| secrets: | ||
| sonarToken: ${{ secrets.SONAR_TOKEN }} | ||
|
|
||
| build: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| with: | ||
| uploadPackage: 'true' | ||
| uploadDocker: 'false' | ||
|
|
@@ -28,7 +28,7 @@ jobs: | |
| publish-nuget: | ||
| needs: | ||
| [build, test] | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| with: | ||
| fullKey: ${{ needs.build.outputs.packageFullKey }} | ||
| forceGithub: false | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| # v3.200.24 | ||
| # v3.200.30 | ||
| name: Release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| release: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].24 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].30 | ||
| secrets: | ||
| envPAT: ${{ secrets.REPO_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><Project> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <!-- These properties will be shared for all projects --> | ||
| <PropertyGroup> | ||
| <VersionPrefix>3.211.0</VersionPrefix> | ||
| <VersionPrefix>3.400.0</VersionPrefix> | ||
| <VersionSuffix> | ||
| </VersionSuffix> | ||
| <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <s:Boolean x:Key="/Default/UserDictionary/Words/=postgre/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/UserDictionary/Words/=virto/@EntryIndexedValue">True</s:Boolean> | ||
| </wpf:ResourceDictionary> |
35 changes: 16 additions & 19 deletions
35
src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <Description>Common the e-commerce domain functionality</Description> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <noWarn>1591</noWarn> | ||
| <IsPackable>True</IsPackable> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <NoWarn>1701;1702;1705;1591</NoWarn> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| <PackageReference Include="TimeZoneConverter" Version="3.2.0" /> | ||
| <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.200.0" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <Description>Common the e-commerce domain functionality</Description> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <noWarn>1591</noWarn> | ||
| <IsPackable>True</IsPackable> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| <PackageReference Include="TimeZoneConverter" Version="3.2.0" /> | ||
| <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" /> | ||
| </ItemGroup> | ||
| </Project> |
20 changes: 6 additions & 14 deletions
20
src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\VirtoCommerce.CoreModule.Data\VirtoCommerce.CoreModule.Data.csproj" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Folder Include="Migrations\" /> | ||
| <ProjectReference Include="..\VirtoCommerce.CoreModule.Data\VirtoCommerce.CoreModule.Data.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Oops, something went wrong.