Skip to content

Commit ad0336a

Browse files
committed
FIX: Build error with packages versions
1 parent de16343 commit ad0336a

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

Src/Apps/Exchange/Ws.PalychExchange.Api/App/Features/Characteristics/Impl/CharacteristicApiService.private.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void DeleteCharacteristics(HashSet<GroupedCharacteristic> dtos)
107107
using IDbContextTransaction transaction = DbContext.Database.BeginTransaction();
108108
try
109109
{
110-
DbContext.BulkDelete(characteristicToDelete);
110+
DbContext.BulkDelete(characteristicToDelete, config => config.UseTempDB = true);
111111
transaction.Commit();
112112
OutputDto.AddSuccess(deletedUid);
113113
}

Src/Apps/Web/Ws.DeviceControl.Api/Ws.DeviceControl.Api.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</ItemGroup>
77

88
<ItemGroup Label="Packages">
9-
<PackageReference Include="Keycloak.AuthServices.Authentication" Version="2.5.3" />
10-
<PackageReference Include="Keycloak.AuthServices.Authorization" Version="2.5.3" />
11-
<PackageReference Include="Keycloak.AuthServices.Common" Version="2.5.3" />
12-
<PackageReference Include="ProjectionTools" Version="1.0.17" />
9+
<PackageReference Include="Keycloak.AuthServices.Authentication" VersionOverride="2.5.3" />
10+
<PackageReference Include="Keycloak.AuthServices.Authorization" VersionOverride="2.5.3" />
11+
<PackageReference Include="Keycloak.AuthServices.Common" VersionOverride="2.5.3" />
12+
<PackageReference Include="ProjectionTools" VersionOverride="1.0.17" />
1313
</ItemGroup>
1414

1515
<ItemGroup Label="Projects">
@@ -18,11 +18,11 @@
1818
<ProjectReference Include="..\..\..\Libs\Ws.Shared\Ws.Shared.csproj" PrivateAssets="All" />
1919
<ProjectReference Include="..\..\..\Infrastructure\Ws.Database.EntityFramework\Ws.Database.EntityFramework.csproj" PrivateAssets="All" />
2020
</ItemGroup>
21-
21+
2222
<ItemGroup Label="For testing additional files">
2323
<Content Include="zHttp\.profiles\*" />
2424
</ItemGroup>
25-
25+
2626
<ItemGroup>
2727
<EmbeddedResource Update="App\Shared\Localization\ApplicationResources.resx">
2828
<Generator>PublicResXFileCodeGenerator</Generator>
@@ -41,7 +41,7 @@
4141
<LastGenOutput>ApplicationResources.ru-RU.Designer.cs</LastGenOutput>
4242
</EmbeddedResource>
4343
</ItemGroup>
44-
44+
4545
<ItemGroup>
4646
<Compile Update="App\Shared\Localization\ApplicationResources.Designer.cs">
4747
<DesignTime>True</DesignTime>

Src/Apps/Web/Ws.DeviceControl.Models/Ws.DeviceControl.Models.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</ItemGroup>
66

77
<ItemGroup Label="Packages">
8-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.8" />
9-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
10-
<PackageReference Include="TscZebra.Plugin.Abstractions" Version="1.0.4" />
8+
<PackageReference Include="Microsoft.AspNetCore.Authorization" VersionOverride="8.0.8" />
9+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" VersionOverride="8.0.8" />
10+
<PackageReference Include="TscZebra.Plugin.Abstractions" VersionOverride="1.0.4" />
1111
</ItemGroup>
1212

1313
<ItemGroup Label="Projects">

Src/Libs/Ws.Barcodes/Features/Barcodes/Utils/BarcodeVarUtils.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ private static List<BarcodeVarInfo> GenerateVariablesInfo()
6262
CreateVariable(() => barcodeBuilder.WeightNet, "{0:D5}"),
6363
CreateVariable(() => barcodeBuilder.BundleCount, "{0:D2}"),
6464
CreateVariable(() => barcodeBuilder.ExpirationDay, "{0:D3}"),
65-
CreateVariable(() => barcodeBuilder.ProductDt, "{0:yyMMdd}"),
66-
CreateVariable(() => barcodeBuilder.ExpirationDt, "{0:yyMMdd}")
65+
CreateVariable(() => barcodeBuilder.ProductDt, "{0:yyMMdd}", true),
66+
CreateVariable(() => barcodeBuilder.ExpirationDt, "{0:yyMMdd}", true)
6767
];
6868
}
6969

Src/Libs/Ws.Shared/Utils/ConfigurationUtil.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class ConfigurationUtil
1313

1414
public static ConfigurationType Config =>
1515
#if RELEASEVS
16-
EnumConfiguration.ReleaseVs;
16+
ConfigurationType.ReleaseVs;
1717
#else
1818
ConfigurationType.DevelopVs;
1919
#endif

0 commit comments

Comments
 (0)