From f86f79d402ac295814e76979b415b3b422b64224 Mon Sep 17 00:00:00 2001
From: Yaroslav Shneider <y.shneider@adguard.com>
Date: Mon, 27 Jun 2022 17:31:21 +0300
Subject: [PATCH] Pull request #391: feature/AG-14573, Create Utils.UI separate
 dll

Merge in ADGUARD-CORE-LIBS/dns-libs from feature/AG-14573 to master

Squashed commit of the following:

commit 4226a4cc21204cc63922938ade626969946b9d96
Author: Yaroslav Shneider <y.shneider@adguard.com>
Date:   Mon Jun 27 15:25:59 2022 +0300

    AG-14573, update packages
---
 .../Adguard.Dns.TestApp/Adguard.Dns.TestApp.csproj        | 8 ++++----
 .../cs/Adguard.Dns/Adguard.Dns.TestApp/packages.config    | 2 +-
 .../Adguard.Dns.Tests/Adguard.Dns.Tests.csproj            | 8 ++++----
 .../cs/Adguard.Dns/Adguard.Dns.Tests/packages.config      | 2 +-
 .../windows/cs/Adguard.Dns/Adguard.Dns/Adguard.Dns.csproj | 8 ++++----
 .../windows/cs/Adguard.Dns/Adguard.Dns/packages.config    | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/Adguard.Dns.TestApp.csproj b/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/Adguard.Dns.TestApp.csproj
index 725ada3f..2671420a 100644
--- a/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/Adguard.Dns.TestApp.csproj
+++ b/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/Adguard.Dns.TestApp.csproj
@@ -37,8 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AdGuard.Utils, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc321ba03e90d705">
-      <HintPath>..\packages\Adguard.Utils.2.1.80\lib\net45\AdGuard.Utils.dll</HintPath>
+    <Reference Include="AdGuard.Utils, Version=2.2.0.0, Culture=neutral, PublicKeyToken=cc321ba03e90d705, processorArchitecture=MSIL">
+      <HintPath>..\packages\Adguard.Utils.2.2.4\lib\net45\AdGuard.Utils.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -94,9 +94,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets'))" />
+    <Error Condition="!Exists('..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets'))" />
   </Target>
-  <Import Project="..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets" Condition="Exists('..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets')" />
+  <Import Project="..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets" Condition="Exists('..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
diff --git a/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/packages.config b/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/packages.config
index a9ab674f..49aee8d4 100644
--- a/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/packages.config
+++ b/platform/windows/cs/Adguard.Dns/Adguard.Dns.TestApp/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Adguard.Utils" version="2.1.80" targetFramework="net45" />
+  <package id="Adguard.Utils" version="2.2.4" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="SharpRaven" version="2.4.0.2" targetFramework="net45" />
   <package id="System.Data.SQLite.Core" version="1.0.106.0" targetFramework="net45" />
diff --git a/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/Adguard.Dns.Tests.csproj b/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/Adguard.Dns.Tests.csproj
index ae694f7c..daa5d365 100644
--- a/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/Adguard.Dns.Tests.csproj
+++ b/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/Adguard.Dns.Tests.csproj
@@ -40,8 +40,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AdGuard.Utils, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc321ba03e90d705">
-      <HintPath>..\packages\Adguard.Utils.2.1.80\lib\net45\AdGuard.Utils.dll</HintPath>
+    <Reference Include="AdGuard.Utils, Version=2.2.0.0, Culture=neutral, PublicKeyToken=cc321ba03e90d705, processorArchitecture=MSIL">
+      <HintPath>..\packages\Adguard.Utils.2.2.4\lib\net45\AdGuard.Utils.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -107,10 +107,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets'))" />
+    <Error Condition="!Exists('..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets'))" />
   </Target>
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets')" />
-  <Import Project="..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets" Condition="Exists('..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets')" />
+  <Import Project="..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets" Condition="Exists('..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
diff --git a/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/packages.config b/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/packages.config
index fe81dcef..23b9fbee 100644
--- a/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/packages.config
+++ b/platform/windows/cs/Adguard.Dns/Adguard.Dns.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Adguard.Utils" version="2.1.80" targetFramework="net45" />
+  <package id="Adguard.Utils" version="2.2.4" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="NUnit" version="3.12.0" targetFramework="net45" />
   <package id="NUnit.ConsoleRunner" version="3.11.1" targetFramework="net45" />
diff --git a/platform/windows/cs/Adguard.Dns/Adguard.Dns/Adguard.Dns.csproj b/platform/windows/cs/Adguard.Dns/Adguard.Dns/Adguard.Dns.csproj
index 24ec45e6..1cd29e54 100644
--- a/platform/windows/cs/Adguard.Dns/Adguard.Dns/Adguard.Dns.csproj
+++ b/platform/windows/cs/Adguard.Dns/Adguard.Dns/Adguard.Dns.csproj
@@ -38,8 +38,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AdGuard.Utils, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc321ba03e90d705">
-      <HintPath>..\packages\Adguard.Utils.2.1.80\lib\net45\AdGuard.Utils.dll</HintPath>
+    <Reference Include="AdGuard.Utils, Version=2.2.0.0, Culture=neutral, PublicKeyToken=cc321ba03e90d705, processorArchitecture=MSIL">
+      <HintPath>..\packages\Adguard.Utils.2.2.4\lib\net45\AdGuard.Utils.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -114,7 +114,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.106.0\build\net45\System.Data.SQLite.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets'))" />
+    <Error Condition="!Exists('..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets'))" />
   </Target>
-  <Import Project="..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets" Condition="Exists('..\packages\Adguard.Utils.2.1.80\build\Adguard.Utils.targets')" />
+  <Import Project="..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets" Condition="Exists('..\packages\Adguard.Utils.2.2.4\build\Adguard.Utils.targets')" />
 </Project>
\ No newline at end of file
diff --git a/platform/windows/cs/Adguard.Dns/Adguard.Dns/packages.config b/platform/windows/cs/Adguard.Dns/Adguard.Dns/packages.config
index a9ab674f..49aee8d4 100644
--- a/platform/windows/cs/Adguard.Dns/Adguard.Dns/packages.config
+++ b/platform/windows/cs/Adguard.Dns/Adguard.Dns/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Adguard.Utils" version="2.1.80" targetFramework="net45" />
+  <package id="Adguard.Utils" version="2.2.4" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="SharpRaven" version="2.4.0.2" targetFramework="net45" />
   <package id="System.Data.SQLite.Core" version="1.0.106.0" targetFramework="net45" />