Merge branch 'master' of https://dev.azure.com/VeragAG/_git/AVISO
This commit is contained in:
@@ -1 +1 @@
|
||||
7.3
|
||||
7.4
|
||||
@@ -100,10 +100,19 @@ Public Class cProgrammeUpdate
|
||||
'Kopieren/Überschreiben der neuen Files:
|
||||
For Each f In LIST_SOURCE
|
||||
If isNewFile(f, LIST_DEST) Then
|
||||
'Dim FI = New IO.FileInfo()
|
||||
|
||||
Dim s_path = dirNameReplace_SOURCE & "\" & If(f.pud_filePathFolder, "") & "\" & f.pud_fileName.Replace("\\", "\")
|
||||
Dim d_path = dirNameReplace_DEST & "\" & If(f.pud_filePathFolder, "") & "\" & f.pud_fileName.Replace("\\", "\")
|
||||
IO.File.Copy(s_path, d_path)
|
||||
If fileStartsWith(f.pud_fileName, ignoreFilesBeginWith) And IO.File.Exists(d_path) Then
|
||||
'Wenn Ziel-Date in der ignore-List und die Datei existiert auch, soll diese nicht kopiert werden.
|
||||
'Wenn Sie nicht exisistiert wir die Datei schon kopiert (zB Standort.txt)
|
||||
Else
|
||||
|
||||
IO.File.Copy(s_path, d_path, True)
|
||||
End If
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
Catch ex As Exception
|
||||
|
||||
9
Aviso/My Project/Resources.Designer.vb
generated
9
Aviso/My Project/Resources.Designer.vb
generated
@@ -269,6 +269,15 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
|
||||
'''</summary>
|
||||
Public ReadOnly Property asdadasda5sd() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("asdadasda5sd", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
|
||||
'''</summary>
|
||||
|
||||
@@ -697,4 +697,7 @@
|
||||
<data name="qr_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\qr_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="asdadasda5sd" xml:space="preserve">
|
||||
<value />
|
||||
</data>
|
||||
</root>
|
||||
Reference in New Issue
Block a user