Skip to content

Commit 39ac176

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/features/desktop-api'
# Conflicts: # Src/App/Libs/Ws.Components/wwwroot/index.js # Src/Apps/Desktop/ScalesDesktop/Platforms/Windows/Package.appxmanifest # Src/Services/Ws.Domain.Services/Features/Templates/TemplateService.cs
2 parents ad16002 + c276b02 commit 39ac176

File tree

1,159 files changed

+31412
-17744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,159 files changed

+31412
-17744
lines changed

.editorconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ trim_trailing_whitespace = true
1515
dotnet_sort_system_directives_first = true
1616
dotnet_separate_import_directive_groups = false
1717

18-
[**.{html,css,scss,js,cshtml,razor}]
18+
[**.{html,css,scss,js,cshtml,razor,json}]
1919
indent_size = 2
2020

2121
[*.{cs,vb}]
@@ -46,10 +46,10 @@ csharp_indent_switch_labels = true
4646
csharp_indent_block_contents = true
4747

4848
# New line preferences
49-
csharp_new_line_before_else = true
49+
csharp_new_line_before_else = true
5050
csharp_new_line_before_catch = true
5151
csharp_new_line_before_finally = true
52-
csharp_new_line_before_open_brace = all
52+
csharp_new_line_before_open_brace = all
5353
csharp_new_line_before_members_in_object_initializers = false
5454
csharp_new_line_before_members_in_anonymous_types = true
5555

.github/workflows/ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ jobs:
2626
uses: actions/setup-dotnet@v4
2727
with:
2828
dotnet-version: 8.x
29-
cache: true
3029

3130
- name: Install dependencies
32-
run: dotnet restore --locked-mode
31+
run: dotnet restore
3332

3433
- name: Run tests
3534
run: |

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
# CSS
99
*.min.css
10+
*\index.js
1011

1112
# Visual Studio 2017 auto generated files
1213
Generated\ Files/
File renamed without changes.
File renamed without changes.

Src/App/Api/Ws.PalychExchangeApi/Properties/PublishProfiles/dev.pubxml

-27
This file was deleted.

Src/App/Api/Ws.PalychExchangeApi/Rest/Brands.rest

-12
This file was deleted.

Src/App/Api/Ws.PalychExchangeApi/Rest/Profiles/http-client.env.json

-11
This file was deleted.

Src/App/Api/Ws.PalychExchangeApi/Ws.PalychExchangeApi.csproj

-11
This file was deleted.

Src/App/Clients/DeviceControl/DeviceControl.csproj

-57
This file was deleted.

Src/App/Clients/DeviceControl/Properties/PublishProfiles/dev-preview.pubxml

-27
This file was deleted.

Src/App/Clients/DeviceControl/Properties/PublishProfiles/dev.pubxml

-27
This file was deleted.

Src/App/Clients/DeviceControl/Properties/PublishProfiles/prod-preview.pubxml

-27
This file was deleted.

Src/App/Clients/DeviceControl/Properties/PublishProfiles/prod.pubxml

-27
This file was deleted.

Src/App/Clients/DeviceControl/Source/App/MainLayout.razor

-24
This file was deleted.

Src/App/Clients/DeviceControl/Source/App/Routes.razor

-25
This file was deleted.

Src/App/Clients/DeviceControl/Source/Features/BarcodeConfigurator/BarcodeItem.cs

-8
This file was deleted.

Src/App/Clients/DeviceControl/Source/Features/BarcodeConfigurator/BarcodeItemType.cs

-7
This file was deleted.

Src/App/Clients/DeviceControl/Source/GlobalUsings.cs

-2
This file was deleted.

Src/App/Clients/DeviceControl/Source/Pages/Admin/PalletMen/PalletMenCreateForm.razor.cs

-28
This file was deleted.

0 commit comments

Comments
 (0)