Merge branch 'master' of http://git.dd:3000/AppStd/Modules

Base/Base.vbproj

@@ -147,6 +147,6 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' }"</PostBuildEvent>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
   </PropertyGroup>
 </Project>

Config/Config.vbproj

@@ -119,9 +119,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Encryption\Encryption.vbproj">
+    <ProjectReference Include="..\Encryption\NNEncryption.vbproj">
       <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
-      <Name>Encryption</Name>
+      <Name>NNEncryption</Name>
     </ProjectReference>
     <ProjectReference Include="..\Logging\Logging.vbproj">
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
@@ -129,4 +129,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Database/Database.vbproj

@@ -146,9 +146,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Encryption\Encryption.vbproj">
+    <ProjectReference Include="..\Encryption\NNEncryption.vbproj">
       <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
-      <Name>Encryption</Name>
+      <Name>NNEncryption</Name>
     </ProjectReference>
     <ProjectReference Include="..\Logging\Logging.vbproj">
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
@@ -164,4 +164,7 @@
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

EDMIAPI/EDMI.API.vbproj

@@ -314,4 +314,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Interfaces/ActiveDirectoryInterface.vb

@@ -70,7 +70,7 @@ Public Class ActiveDirectoryInterface
                 _logger.Debug("Synced {0} users to MSSQLServer", oSyncedUsersMSSQL.Count)
             End If
         Else
-            _logger.Debug("SyncUsersForGroup: _mssql is nothing. ")
+            _logger.Debug("SyncUsersForGroup: _mssql is nothing.")
         End If
 
         Return oUsers

Interfaces/Interfaces.vbproj

@@ -169,4 +169,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Jobs/Jobs.vbproj

@@ -138,4 +138,7 @@
     <Reference Include="System.XML.Linq" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

License/License.vbproj

@@ -128,4 +128,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Logging/Logging.vbproj

@@ -116,4 +116,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Messaging/Messaging.vbproj

@@ -151,4 +151,7 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Modules.sln

@@ -11,7 +11,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Database", "Database\Databa
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.API", "EDMIAPI\EDMI.API.vbproj", "{25017513-0D97-49D3-98D7-BA76D9B251B0}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Encryption", "Encryption\Encryption.vbproj", "{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NNEncryption", "Encryption\NNEncryption.vbproj", "{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Interfaces", "Interfaces\Interfaces.vbproj", "{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}"
 EndProject

Patterns/Patterns.vbproj

@@ -153,4 +153,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Windows/Windows.vbproj

@@ -173,4 +173,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Windream/Windream.vbproj

@@ -154,4 +154,11 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

ZooFlow/ZooFlow.vbproj

@@ -142,4 +142,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

copy-binary.ps1

@@ -1,11 +1,29 @@
 param(
 	[String]$SourcePath,
 	[String]$FileName,
-	[String]$Configuration
+	[String]$Configuration,
+	[String]$ProjectName
 )
 
-if ($Configuration -eq "Release") {
+$ArchiveFolderName = "Archiv"
-    $DestinationPath = "P:\Install .Net\0 DD - Bibliotheken\Modules\$FileName"
+$DestinationPath = "P:\Install .Net\0 DD - Bibliotheken\Modules\$ProjectName\"
-    Copy-Item $SourcePath -Destination $DestinationPath
+$DestinationFilePath = [IO.Path]::Combine($DestinationPath, $FileName)
-}
+$ArchiveBasePath = [IO.Path]::Combine($DestinationPath, $ArchiveFolderName)
 
+if ($Configuration -eq "Release") {
+	$DateFolderName = $((Get-Date).ToString('yyyy-MM-dd_hh-mm')) 
+	$ArchivePath = [IO.Path]::Combine($ArchiveBasePath, $DateFolderName)
+	
+	if (!(Test-Path -Path $ArchiveBasePath)) {
+		New-Item -Path $ArchiveBasePath -Type Directory
+	}
+	
+	if (Test-Path -Path $DestinationFilePath) {
+		if (!(Test-Path -Path $ArchivePath)) {
+			New-Item -Path $ArchivePath -Type Directory
+		}
+		Copy-Item $DestinationFilePath -Destination $ArchivePath
+	}
+
+    Copy-Item $SourcePath -Destination $DestinationFilePath
+}