update version

acceliance · Jan 27, 2022 · 5b809e6 · 5b809e6
1 parent db238a8
commit 5b809e6
Show file tree

Hide file tree

Showing 22 changed files with 93 additions and 98 deletions.
diff --git a/...dge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj b/...dge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Title>IngeniBridge.GenerateFullInventory</Title>
     <Version>1.0.0</Version>
     <Authors>JTO Tec</Authors>
@@ -14,22 +14,25 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="EPPlus" Version="5.7.2" />
-    <PackageReference Include="IngeniBridge.BuildUtils" Version="1.0.18" />
-    <PackageReference Include="IngeniBridge.Core" Version="1.0.64" />
-    <PackageReference Include="IngeniBridge.StorageAccessor.InMemory" Version="1.0.31" />
-    <PackageReference Include="JT.TechCases.Threading" Version="1.0.19" />
-    <PackageReference Include="log4net" Version="2.0.12" />    
+    <PackageReference Include="EPPlus" Version="5.8.5" />
+    <PackageReference Include="IngeniBridge.BuildUtils" Version="1.0.21" />
+    <PackageReference Include="IngeniBridge.Core" Version="1.0.67" />
+    <PackageReference Include="IngeniBridge.StorageAccessor.InMemory" Version="1.0.33" />
+    <PackageReference Include="JT.TechCases.Threading" Version="1.0.20" />
+    <PackageReference Include="log4net" Version="2.0.14" />    
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.core\1.0.64\lib\netstandard2.0\IngeniBridge.Core.dll $(TargetDir)&#xD;&#xA;" />
-    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.storageaccessor.inmemory\1.0.31\lib\netstandard2.0\IngeniBridge.StorageAccessor.InMemory.dll $(TargetDir)&#xD;&#xA;" />
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.core\1.0.67\lib\netstandard2.0\IngeniBridge.Core.dll $(TargetDir)&#xD;&#xA;" />
+    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.storageaccessor.inmemory\1.0.33\lib\netstandard2.0\IngeniBridge.StorageAccessor.InMemory.dll $(TargetDir)&#xD;&#xA;" />
   </Target>
 
 </Project>
diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Program.cs b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Program.cs
@@ -20,6 +20,7 @@ class Program
         private static readonly ILog log = LogManager.GetLogger ( System.Reflection.MethodBase.GetCurrentMethod ().DeclaringType );
         static int Main ( string [] args )
         {
+            ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
             int exitCode = 0;
             XmlConfigurator.Configure ( LogManager.GetRepository ( Assembly.GetEntryAssembly () ), new FileInfo ( "log4net.config" ) );
             CommandLineOptions options = null;
@@ -53,7 +54,7 @@ static int Main ( string [] args )
                 log.Info ( "DataModel Version Minor => " + accessor.Version.Minor.ToString () );
                 log.Info ( "DataModel Version Build => " + accessor.Version.Build.ToString () );
                 TreeChecker tc = new TreeChecker ( accessor );
-                Console.WriteLine ( "Vérification de l'arbre..." );
+                log.Info ( "Vérification de l'arbre..." );
                 tc.CheckTree ( true, message => log.Error ( message ) );
                 FileInfo fi = new FileInfo ( options.InventoryFile );
                 if ( fi.Exists ) fi.Delete ();

diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Properties/launchSettings.json b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "IngeniBridge.GenerateFullInventory": {
       "commandName": "Project",
-      "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\MasterAssetMyCompany_2020_01_03.ibdb --InventoryFile=InventoryFileIB.xlsx"
+      "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=\"..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\DatabaseInit\\MasterAssetMyCompany_2022_01_27.ibdb\" --InventoryFile=InventoryFileIB.xlsx"
     }
   }
 }
diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Title>IngeniBridge.IBDatabaseParser</Title>
     <Version>1.0.0</Version>
     <Authors>JTO Tec</Authors>
@@ -14,11 +14,11 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="IngeniBridge.BuildUtils" Version="1.0.18" />
-    <PackageReference Include="IngeniBridge.Core" Version="1.0.64" />
-    <PackageReference Include="IngeniBridge.StorageAccessor.InMemory" Version="1.0.31" />
-    <PackageReference Include="JT.TechCases.Threading" Version="1.0.19" />
-    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="IngeniBridge.BuildUtils" Version="1.0.21" />
+    <PackageReference Include="IngeniBridge.Core" Version="1.0.67" />
+    <PackageReference Include="IngeniBridge.StorageAccessor.InMemory" Version="1.0.33" />
+    <PackageReference Include="JT.TechCases.Threading" Version="1.0.20" />
+    <PackageReference Include="log4net" Version="2.0.14" />
   </ItemGroup>
 
 
@@ -28,13 +28,9 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.core\1.0.64\lib\netstandard2.0\IngeniBridge.Core.dll $(TargetDir)&#xD;&#xA;" />
-    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.storageaccessor.inmemory\1.0.31\lib\netstandard2.0\IngeniBridge.StorageAccessor.InMemory.dll $(TargetDir)&#xD;&#xA;" />
+    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.core\1.0.67\lib\netstandard2.0\IngeniBridge.Core.dll $(TargetDir)&#xD;&#xA;" />
+    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.storageaccessor.inmemory\1.0.33\lib\netstandard2.0\IngeniBridge.StorageAccessor.InMemory.dll $(TargetDir)&#xD;&#xA;" />
   </Target>
 
 </Project>
diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Properties/launchSettings.json b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "IngeniBridge.IBDatabaseParser": {
       "commandName": "Project",
-      "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\MasterAssetMyCompany_2020_01_03.ibdb"
+      "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\DatabaseInit\\MasterAssetMyCompany_2022_01_27.ibdb"
     }
   }
 }
diff --git a/...ridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompanyNew_2020_05_03.ibdb_Database.xlsx b/...ridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompanyNew_2020_05_03.ibdb_Database.xlsx
diff --git a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb
diff --git a/...niBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb_Database.xlsx b/...niBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb_Database.xlsx
diff --git a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_27.ibdb b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_27.ibdb
diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany.sln b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany.sln
@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31410.357
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyDataModel", "MyCompanyDataModel\MyCompanyDataModel.csproj", "{43213853-C6F5-4CC4-B1C5-3FEAD2355024}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IngeniBridge.Samples.MyCompany", "IngeniBridge.Samples.MyCompany\IngeniBridge.Samples.MyCompany.csproj", "{8410C11D-DDED-46BA-B855-1813A1CF98A4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{43213853-C6F5-4CC4-B1C5-3FEAD2355024}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43213853-C6F5-4CC4-B1C5-3FEAD2355024}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43213853-C6F5-4CC4-B1C5-3FEAD2355024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8410C11D-DDED-46BA-B855-1813A1CF98A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8410C11D-DDED-46BA-B855-1813A1CF98A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8410C11D-DDED-46BA-B855-1813A1CF98A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8410C11D-DDED-46BA-B855-1813A1CF98A4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...dge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj b/...dge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Title>IngeniBridge.Samples.MyCompany</Title>
     <Version>1.0.0</Version>
     <Authors>JTO Tec</Authors>
@@ -19,11 +19,11 @@
   <ItemGroup>
     <PackageReference Include="CodexMicroORM.Core" Version="0.9.3" />
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="IngeniBridge.BuildUtils" Version="1.0.16" />
-    <PackageReference Include="IngeniBridge.Core" Version="1.0.59" />
-    <PackageReference Include="IngeniBridge.StorageAccessor.InMemory" Version="1.0.28" />
-    <PackageReference Include="JT.TechCases.Threading" Version="1.0.18" />
-    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="IngeniBridge.BuildUtils" Version="1.0.21" />
+    <PackageReference Include="IngeniBridge.Core" Version="1.0.67" />
+    <PackageReference Include="IngeniBridge.StorageAccessor.InMemory" Version="1.0.33" />
+    <PackageReference Include="JT.TechCases.Threading" Version="1.0.20" />
+    <PackageReference Include="log4net" Version="2.0.14" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,11 +36,8 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
+
 <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.storageaccessor.inmemory\1.0.26\lib\netstandard2.0\IngeniBridge.StorageAccessor.InMemory.dll $(TargetDir)&#xD;&#xA;" />
+    <Exec Command="copy %25userprofile%25\.nuget\packages\ingenibridge.storageaccessor.inmemory\1.0.33\lib\netstandard2.0\IngeniBridge.StorageAccessor.InMemory.dll $(TargetDir)&#xD;&#xA;" />
   </Target>
 </Project>