From 9ac9895ed40165dadcfee03452799e00c04aaa69 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 31 Jan 2024 10:05:28 +0100 Subject: [PATCH] Integrate copy-binary-ps1 script --- Base/Base.vbproj | 2 +- Config/Config.vbproj | 7 +++-- Database/Database.vbproj | 7 +++-- EDMIAPI/EDMI.API.vbproj | 3 +++ ...{Encryption.vbproj => NNEncryption.vbproj} | 0 Interfaces/ActiveDirectoryInterface.vb | 2 +- Interfaces/Interfaces.vbproj | 3 +++ Jobs/Jobs.vbproj | 3 +++ License/{License.vbproj => NNLicense.vbproj} | 0 Logging/Logging.vbproj | 3 +++ Messaging/Messaging.vbproj | 3 +++ Modules.sln | 4 +-- Patterns/Patterns.vbproj | 3 +++ Windows/Windows.vbproj | 3 +++ Windream/Windream.vbproj | 7 +++++ ZooFlow/ZooFlow.vbproj | 3 +++ copy-binary.ps1 | 26 ++++++++++++++++--- 17 files changed, 67 insertions(+), 12 deletions(-) rename Encryption/{Encryption.vbproj => NNEncryption.vbproj} (100%) rename License/{License.vbproj => NNLicense.vbproj} (100%) diff --git a/Base/Base.vbproj b/Base/Base.vbproj index fbc6f14d..bb03a7e8 100644 --- a/Base/Base.vbproj +++ b/Base/Base.vbproj @@ -147,6 +147,6 @@ - powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' }" + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" \ No newline at end of file diff --git a/Config/Config.vbproj b/Config/Config.vbproj index 3551eb08..a6a1d69b 100644 --- a/Config/Config.vbproj +++ b/Config/Config.vbproj @@ -119,9 +119,9 @@ - + {8a8f20fc-c46e-41ac-bee7-218366cfff99} - Encryption + NNEncryption {903b2d7d-3b80-4be9-8713-7447b704e1b0} @@ -129,4 +129,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Database/Database.vbproj b/Database/Database.vbproj index 89b6477f..995cb2d6 100644 --- a/Database/Database.vbproj +++ b/Database/Database.vbproj @@ -146,9 +146,9 @@ - + {8a8f20fc-c46e-41ac-bee7-218366cfff99} - Encryption + NNEncryption {903b2d7d-3b80-4be9-8713-7447b704e1b0} @@ -164,4 +164,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/EDMIAPI/EDMI.API.vbproj b/EDMIAPI/EDMI.API.vbproj index 10dfec3b..262ecaaa 100644 --- a/EDMIAPI/EDMI.API.vbproj +++ b/EDMIAPI/EDMI.API.vbproj @@ -314,4 +314,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Encryption/Encryption.vbproj b/Encryption/NNEncryption.vbproj similarity index 100% rename from Encryption/Encryption.vbproj rename to Encryption/NNEncryption.vbproj diff --git a/Interfaces/ActiveDirectoryInterface.vb b/Interfaces/ActiveDirectoryInterface.vb index a3c1ca37..0c8a04c3 100644 --- a/Interfaces/ActiveDirectoryInterface.vb +++ b/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 diff --git a/Interfaces/Interfaces.vbproj b/Interfaces/Interfaces.vbproj index e29ad049..d26f6698 100644 --- a/Interfaces/Interfaces.vbproj +++ b/Interfaces/Interfaces.vbproj @@ -169,4 +169,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj index 197c297a..3b82f5ae 100644 --- a/Jobs/Jobs.vbproj +++ b/Jobs/Jobs.vbproj @@ -138,4 +138,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/License/License.vbproj b/License/NNLicense.vbproj similarity index 100% rename from License/License.vbproj rename to License/NNLicense.vbproj diff --git a/Logging/Logging.vbproj b/Logging/Logging.vbproj index 72d00292..b818b62b 100644 --- a/Logging/Logging.vbproj +++ b/Logging/Logging.vbproj @@ -116,4 +116,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Messaging/Messaging.vbproj b/Messaging/Messaging.vbproj index 63fd34b6..9a86015f 100644 --- a/Messaging/Messaging.vbproj +++ b/Messaging/Messaging.vbproj @@ -151,4 +151,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Modules.sln b/Modules.sln index 470454c8..6f368b0f 100644 --- a/Modules.sln +++ b/Modules.sln @@ -11,13 +11,13 @@ 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 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NNLicense", "License\NNLicense.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging", "Logging\Logging.vbproj", "{903B2D7D-3B80-4BE9-8713-7447B704E1B0}" EndProject diff --git a/Patterns/Patterns.vbproj b/Patterns/Patterns.vbproj index 0fe15dfc..2da07c8c 100644 --- a/Patterns/Patterns.vbproj +++ b/Patterns/Patterns.vbproj @@ -153,4 +153,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj index bf125735..8d73efe6 100644 --- a/Windows/Windows.vbproj +++ b/Windows/Windows.vbproj @@ -173,4 +173,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Windream/Windream.vbproj b/Windream/Windream.vbproj index fbcf6136..6f9ecb0e 100644 --- a/Windream/Windream.vbproj +++ b/Windream/Windream.vbproj @@ -154,4 +154,11 @@ + + + + + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/ZooFlow/ZooFlow.vbproj b/ZooFlow/ZooFlow.vbproj index b10f3f7e..76ca9968 100644 --- a/ZooFlow/ZooFlow.vbproj +++ b/ZooFlow/ZooFlow.vbproj @@ -142,4 +142,7 @@ + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/copy-binary.ps1 b/copy-binary.ps1 index ae76d6f5..317ca9b5 100644 --- a/copy-binary.ps1 +++ b/copy-binary.ps1 @@ -1,11 +1,29 @@ param( [String]$SourcePath, [String]$FileName, - [String]$Configuration + [String]$Configuration, + [String]$ProjectName ) +$ArchiveFolderName = "Archiv" +$DestinationPath = "P:\Install .Net\0 DD - Bibliotheken\Modules\$ProjectName\" +$DestinationFilePath = [IO.Path]::Combine($DestinationPath, $FileName) +$ArchiveBasePath = [IO.Path]::Combine($DestinationPath, $ArchiveFolderName) + if ($Configuration -eq "Release") { - $DestinationPath = "P:\Install .Net\0 DD - Bibliotheken\Modules\$FileName" - Copy-Item $SourcePath -Destination $DestinationPath -} + $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 +}