From 2423401445bfd3c8d536fba7e61cf84a6c4631d7 Mon Sep 17 00:00:00 2001
From: gusev_p <gusev_p@knopka.com>
Date: Tue, 28 Jun 2016 21:42:50 +0500
Subject: [PATCH] =?UTF-8?q?ilmerge=20+=20=D0=B2=D0=B0=D0=BB=D1=8E=D1=82?=
 =?UTF-8?q?=D1=8B=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D1=8F=D1=8E=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=D1=81=D0=B0=D0=BC=D0=B8=20=D0=BF=D0=BE=20=D1=81?=
 =?UTF-8?q?=D0=B5=D0=B1=D0=B5,=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D1=82=20=D1=81=D1=82=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B7=D0=B6=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D1=8F=D1=89=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  |  1 +
 Simple1C/Simple1C.csproj    | 11 +++++++++--
 Simple1C/packages.config    |  1 +
 Tests/COMDataContextTest.cs |  4 ++--
 Tests/Tests.csproj          |  9 ++-------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e4925d..0678382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.mdb
 *.userprefs
 bin/
+bin.tests/
 obj/
 packages/
 *.designer.cs
diff --git a/Simple1C/Simple1C.csproj b/Simple1C/Simple1C.csproj
index 5b7b89c..2d12d88 100644
--- a/Simple1C/Simple1C.csproj
+++ b/Simple1C/Simple1C.csproj
@@ -36,6 +36,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Impl\ComDataContext.cs" />
@@ -104,8 +105,14 @@
   <!-- 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">
-  </Target>
+  </Target>-->
+
   <Target Name="AfterBuild">
+    <CreateItem Include="@(ReferencePath)" Condition="'%(CopyLocal)'=='true'">
+      <Output TaskParameter="Include" ItemName="IlmergeAssemblies" />
+    </CreateItem>
+    <Exec Command="&quot;..\packages\ilmerge.2.14.1208\tools\ILMerge.exe&quot; /internalize /out:@(MainAssembly) &quot;@(IntermediateAssembly)&quot; @(IlmergeAssemblies->'&quot;%(FullPath)&quot;', ' ')" />
+    <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  -->
+
 </Project>
\ No newline at end of file
diff --git a/Simple1C/packages.config b/Simple1C/packages.config
index aaa2743..bee0ec9 100644
--- a/Simple1C/packages.config
+++ b/Simple1C/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="ILMerge" version="2.14.1208" targetFramework="net45" />
   <package id="Remotion.Linq" version="2.0.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Tests/COMDataContextTest.cs b/Tests/COMDataContextTest.cs
index f6bb73a..5ee2b49 100644
--- a/Tests/COMDataContextTest.cs
+++ b/Tests/COMDataContextTest.cs
@@ -454,7 +454,7 @@ public void CanAddRecursive()
         [Test]
         public void CanWritePreviouslyReadInformationRegister()
         {
-            var период = DateTime.Today;
+            var период = new DateTime(2025, 7, 17);
             var курс = new КурсыВалют
             {
                 Валюта = dataContext.Single<Валюты>(x => x.Код == "643"),
@@ -478,7 +478,7 @@ public void CanWritePreviouslyReadInformationRegister()
         [Test]
         public void CanReadWriteInformationRegister()
         {
-            var период = DateTime.Today;
+            var период = new DateTime(2025, 7, 18);
             var курс = new КурсыВалют
             {
                 Валюта = dataContext.Single<Валюты>(x => x.Код == "643"),
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 8543f02..d1bfa29 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin.tests\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin.tests\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -37,14 +37,9 @@
     <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Remotion.Linq, Version=2.0.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Remotion.Linq.2.0.2\lib\net45\Remotion.Linq.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Management" />
   </ItemGroup>
   <ItemGroup>