diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-11 04:45:05 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-11 04:45:05 +0200 |
| commit | a63b5db93859fac695d1b9faea23b79e3a070179 (patch) | |
| tree | f8ea2bd501d6d2fb14fabac1a2989b04887444c8 /Software/Visual_Studio/Web/Tango.MachineService | |
| parent | 0bd41535d72cf2e6c50267783bfd098ae5263d6e (diff) | |
| download | Tango-a63b5db93859fac695d1b9faea23b79e3a070179.tar.gz Tango-a63b5db93859fac695d1b9faea23b79e3a070179.zip | |
Fixed issues with reset counters.
Display general authorization error instead of unexpected application error.
Display environment on FSE.
Completed cleaner dispensing dialog.
Hide/show "Open/Close dyeing head lid" on Flat/Arc.
Emulator will raise proper "Opened" events after "Open dyeing head lid" command.
Updated EF Extensions version to all project due to a bug in "DeleteFromQuery".
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService')
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj | 14 | ||||
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/packages.config | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index bccd84cad..2e05ad690 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -277,14 +277,14 @@ <Private>True</Private> <HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath> </Reference> - <Reference Include="Z.EntityFramework.Extensions, Version=4.0.50.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Z.EntityFramework.Extensions.4.0.50\lib\net45\Z.EntityFramework.Extensions.dll</HintPath> + <Reference Include="Z.EntityFramework.Extensions, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll</HintPath> </Reference> - <Reference Include="Z.EntityFramework.Plus.EF6, Version=1.12.13.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.1.12.13\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath> + <Reference Include="Z.EntityFramework.Plus.EF6, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath> </Reference> - <Reference Include="Z.Expressions.Eval, Version=3.1.5.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Z.Expressions.Eval.3.1.5\lib\net45\Z.Expressions.Eval.dll</HintPath> + <Reference Include="Z.Expressions.Eval, Version=4.0.27.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -505,7 +505,7 @@ <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> </WebProjectProperties> </FlavorProperties> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> diff --git a/Software/Visual_Studio/Web/Tango.MachineService/packages.config b/Software/Visual_Studio/Web/Tango.MachineService/packages.config index 599e31535..f2f83d078 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/packages.config +++ b/Software/Visual_Studio/Web/Tango.MachineService/packages.config @@ -44,7 +44,7 @@ <package id="System.Data.SQLite.EF6" version="1.0.108.0" targetFramework="net46" /> <package id="System.Data.SQLite.Linq" version="1.0.108.0" targetFramework="net46" /> <package id="WebGrease" version="1.5.2" targetFramework="net45" /> - <package id="Z.EntityFramework.Extensions" version="4.0.50" targetFramework="net461" /> - <package id="Z.EntityFramework.Plus.EF6" version="1.12.13" targetFramework="net461" /> - <package id="Z.Expressions.Eval" version="3.1.5" targetFramework="net461" /> + <package id="Z.EntityFramework.Extensions" version="5.1.6" targetFramework="net461" /> + <package id="Z.EntityFramework.Plus.EF6" version="5.1.6" targetFramework="net461" /> + <package id="Z.Expressions.Eval" version="4.0.27" targetFramework="net461" /> </packages>
\ No newline at end of file |