From d903658c13125f07a9c669b4944e9330b8554a3f Mon Sep 17 00:00:00 2001 From: Developer01 Date: Mon, 23 Sep 2024 17:14:28 +0200 Subject: [PATCH] MS Update Globix Renaming --- Global_Indexer/ClassDatatables.vb | 2 +- Global_Indexer/ClassIndexFunctions.vb | 2 +- Global_Indexer/ClassInit.vb | 18 ++-- Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico | Bin 14942 -> 0 bytes Global_Indexer/DD_Icons_ICO_GLOBIX_128.ico | Bin 53262 -> 0 bytes Global_Indexer/Global_Indexer.vbproj | 9 +- Global_Indexer/ModuleRuntime.vb | 1 - Global_Indexer/My Project/AssemblyInfo.vb | 2 +- Global_Indexer/MyDataset.Designer.vb | 4 +- Global_Indexer/MyDataset.xsd | 2 +- Global_Indexer/file.ico | Bin 3492 -> 0 bytes Global_Indexer/frmAdministration.resx | 106 ++++++++++----------- Global_Indexer/frmAdministration.vb | 18 ++-- Global_Indexer/frmStart.vb | 10 +- SetupVS19/Config.wxi | 2 +- SetupVS19/Product.wxs | 3 +- SetupVS19/SetupVS19.wixproj | 2 +- 17 files changed, 88 insertions(+), 93 deletions(-) delete mode 100644 Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico delete mode 100644 Global_Indexer/DD_Icons_ICO_GLOBIX_128.ico delete mode 100644 Global_Indexer/file.ico diff --git a/Global_Indexer/ClassDatatables.vb b/Global_Indexer/ClassDatatables.vb index 7436e3d..ec84d17 100644 --- a/Global_Indexer/ClassDatatables.vb +++ b/Global_Indexer/ClassDatatables.vb @@ -120,7 +120,7 @@ FROM TBDD_USER_DOKTYPE WHERE DOCTYPE_ID = {ProfileId} ) - AND GUID IN (SELECT USER_ID FROM [dbo].[FNDD_GET_USER_FOR_MODULE] ('GLOBIX', 1)) + AND GUID IN (SELECT USER_ID FROM [dbo].[FNDD_GET_USER_FOR_MODULE] ('fileFLOW', 1)) " Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) diff --git a/Global_Indexer/ClassIndexFunctions.vb b/Global_Indexer/ClassIndexFunctions.vb index 351ea62..33eb4fe 100644 --- a/Global_Indexer/ClassIndexFunctions.vb +++ b/Global_Indexer/ClassIndexFunctions.vb @@ -68,7 +68,7 @@ Public Class ClassIndexFunctions Else Dim oResult As DialogResult Dim oDate As String = oFileExists.ToString("d") - Dim oBoxTitle = $"GLOBIX - {pModuleTitle}" + Dim oBoxTitle = $"fileFLOW - {pModuleTitle}" Dim oMessage As String If USER_LANGUAGE = "de-DE" Then diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index eb13ded..cb9d1df 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -16,15 +16,15 @@ Public Class ClassInit LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, CompanyName:=My.Application.Info.CompanyName, ProductName:=My.Application.Info.ProductName) - LOGGER = LOGCONFIG.GetLogger("Globix") + LOGGER = LOGCONFIG.GetLogger("fileFLOW") LOGGER.Info("Programmstart: " & Now) LOGGER.Info("Username: {0}", Environment.UserName) End Sub Public Sub InitConfig() Dim oUtils = New ConfigUtils(LOGCONFIG) - oUtils.MigrateUserAppDataConfig(Application.UserAppDataPath, Application.ProductName, "Global Indexer") - oUtils.MigrateCommonAppDataConfig(Application.CommonAppDataPath, Application.ProductName, "Global Indexer") + oUtils.MigrateUserAppDataConfig(Application.UserAppDataPath, Application.ProductName, "fileFLOW") + oUtils.MigrateCommonAppDataConfig(Application.CommonAppDataPath, Application.ProductName, "fileFLOW") CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) @@ -117,7 +117,7 @@ Public Class ClassInit Public Function Load_BasicConfig() Try 'ClassDatabase.Init() - Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'Global-Indexer'" + Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'fileFLOW'" Dim DT As DataTable = DATABASE_ECM.GetDatatable(oSql) If DT.Rows.Count = 1 Then @@ -241,7 +241,7 @@ Public Class ClassInit Try Dim oSql As String - oSql = String.Format($"SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{Environment.UserName}','GLOBIX',{1})") + oSql = String.Format($"SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{Environment.UserName}','fileFLOW',{1})") Dim DT_CHECKUSER_MODULE As DataTable = DATABASE_ECM.GetDatatable(oSql) If DT_CHECKUSER_MODULE.Rows.Count = 0 Then LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0") @@ -294,18 +294,18 @@ Public Class ClassInit End If USER_LANGUAGE = oRow.Item("USER_LANGUAGE") - oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" + oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'fileFLOW'" DATABASE_ECM.ExecuteNonQuery(oSql) - oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE, CLIENT_ID) VALUES (" & USER_ID & ",'Global-Indexer', 1)" + oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE, CLIENT_ID) VALUES (" & USER_ID & ",'fileFLOW', 1)" DATABASE_ECM.ExecuteNonQuery(oSql) - oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')" + oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'fileFLOW'" If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für fileFLOW!") If USER_IS_ADMIN = False Then 'Anmeldung wieder herausnehmen - oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'" + oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'fileFLOW'" DATABASE_ECM.ExecuteNonQuery(oSql) LOGGER.Info(" - Wieder abgemeldet") START_INCOMPLETE = True diff --git a/Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico b/Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico deleted file mode 100644 index 64d5152d9f490b2b85fe51cee13214f1be84d218..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14942 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 - - - PreserveNewest - - - PreserveNewest + + Always - PreserveNewest diff --git a/Global_Indexer/ModuleRuntime.vb b/Global_Indexer/ModuleRuntime.vb index 5e2613b..13702c7 100644 --- a/Global_Indexer/ModuleRuntime.vb +++ b/Global_Indexer/ModuleRuntime.vb @@ -29,5 +29,4 @@ Module ModuleRuntime Public Property DATABASE_ECM As MSSQLServer Public Property DATABASE_IDB As MSSQLServer - Public Property DebugDisplay As Boolean = False End Module diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 42ba56f..ba77458 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 7c88993..3f5f8ce 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -15855,8 +15855,8 @@ Namespace MyDatasetTableAdapters ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT T.DOKART_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " FROM TBDD_DOKUMENTART_MODULE AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " TBDD_MODULES AS T1 ON T.MODULE_ID = "& _ - "T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.NAME = 'Global-Indexer'"& _ - ")))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE, BEZEICHNUNG" + "T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.NAME = 'fileFLOW')))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"O"& _ + "RDER BY SEQUENCE, BEZEICHNUNG" Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text End Sub diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index d5db766..511482c 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -236,7 +236,7 @@ WHERE (GUID IN (SELECT T.DOKART_ID FROM TBDD_DOKUMENTART_MODULE AS T INNER JOIN TBDD_MODULES AS T1 ON T.MODULE_ID = T1.GUID - WHERE (T1.NAME = 'Global-Indexer'))) + WHERE (T1.NAME = 'fileFLOW'))) ORDER BY SEQUENCE, BEZEICHNUNG diff --git a/Global_Indexer/file.ico b/Global_Indexer/file.ico deleted file mode 100644 index 7296965fa4729acf96e7bfb66fbb6239608ff26e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3492 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 diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index e250b62..3899218 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -132,7 +132,7 @@ 189, -255 - 23, 15 + 22, 15 0 @@ -319,7 +319,7 @@ 170 - 1070, 247 + 1070, 249 88 @@ -382,7 +382,7 @@ 1 - 1070, 564 + 1070, 566 88 @@ -1073,13 +1073,13 @@ Grundeinstellungen - 1310, 151 + 1310, 147 - 0, 775 + 0, 773 - 1310, 21 + 1310, 23 RibbonStatusBar1 @@ -1220,7 +1220,7 @@ 150 - 1070, 278 + 1070, 280 1 @@ -1286,7 +1286,7 @@ 1 - 1070, 564 + 1070, 566 0 @@ -1307,7 +1307,7 @@ Fill - 0, 151 + 0, 147 127, 17 @@ -1361,7 +1361,7 @@ 277 - 224, 594 + 224, 596 93 @@ -1577,7 +1577,7 @@ 5 - Tahoma, 8.25pt, style=Bold + Tahoma, 8.25pt 10, 6 @@ -1652,13 +1652,13 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt 155, 86 - 66, 15 + 62, 15 87 @@ -1682,16 +1682,16 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl - 155, 39 + 155, 37 - 82, 15 + 78, 15 87 @@ -1715,7 +1715,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -1724,13 +1724,13 @@ 7, 37 - 41, 15 + 21, 15 87 - GUID: + ID: Label7 @@ -1748,7 +1748,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -1757,7 +1757,7 @@ 7, 128 - 55, 15 + 53, 15 87 @@ -1781,7 +1781,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -1790,7 +1790,7 @@ 7, 170 - 86, 15 + 82, 15 87 @@ -1913,16 +1913,16 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl - 448, 34 + 448, 37 - 64, 15 + 60, 15 87 @@ -1946,16 +1946,16 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl - 70, 38 + 70, 37 - 78, 15 + 73, 15 87 @@ -2033,7 +2033,7 @@ 73, 56 - 3900, 24 + 75, 24 91 @@ -2078,13 +2078,13 @@ True - Tahoma, 8.25pt, style=Bold + Segoe UI, 9pt - 598, 39 + 598, 37 - 241, 13 + 222, 15 96 @@ -2135,7 +2135,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -2144,7 +2144,7 @@ 7, 212 - 119, 15 + 114, 15 87 @@ -2306,7 +2306,7 @@ Bottom - 0, 514 + 0, 275 True @@ -3279,7 +3279,7 @@ der Datei 150, 0 - 3821, 33 + 922, 274 96 @@ -3303,7 +3303,7 @@ der Datei 0, 0 - 150, 33 + 150, 274 95 @@ -3338,7 +3338,7 @@ der Datei - 3971, 33 + 1072, 274 manuelle Indexe @@ -3356,7 +3356,7 @@ der Datei 0 - 3973, 61 + 1074, 302 86 @@ -3374,7 +3374,7 @@ der Datei 0, 0 - 150, 278 + 150, 274 97 @@ -4271,7 +4271,7 @@ der Datei - 1070, 278 + 1070, 274 Nachbearbeitungsfunktionen manueller Index @@ -4431,7 +4431,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 100, 278 + 100, 274 90 @@ -5181,7 +5181,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 278 + 1070, 274 automatische/feste Indexe @@ -5618,7 +5618,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 278 + 1070, 274 Dynamischer Ordnerpfad @@ -6073,7 +6073,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 278 + 1070, 274 Automatische Profilauswahl @@ -6505,7 +6505,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1072, 592 + 1072, 594 Profil-Verwaltung @@ -6523,7 +6523,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0 - 1074, 624 + 1074, 626 1 @@ -6562,7 +6562,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 564 + 1070, 566 Gruppen-Zuordnung @@ -6580,7 +6580,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1 - 1072, 592 + 1072, 594 89 @@ -6610,7 +6610,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 564 + 1070, 566 Benutzer-Zuordnung @@ -6662,7 +6662,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1072, 592 + 1072, 594 Profil-Zuordnung @@ -6707,7 +6707,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1 - 1310, 624 + 1310, 626 4 diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 95043d4..ee9815a 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -212,9 +212,9 @@ Public Class frmAdministration Dim oNewID As Integer oNewID = DATABASE_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_DOKUMENTART") If IsNumeric(oNewID) Then - Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX', {oNewID}" + Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'fileFLOW', {oNewID}" If DATABASE_ECM.ExecuteNonQuery(osql) = False Then - MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text) + MsgBox("Fehler beim zuweisen des neuen Profils zum Modul fileFLOW/GI!", MsgBoxStyle.Critical, Text) End If End If End If @@ -299,9 +299,9 @@ Public Class frmAdministration End Sub Private Sub btnadd_Click(sender As Object, e As EventArgs) - Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{DOKART_GUIDTextBox.Text}" + Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'fileFLOW',{DOKART_GUIDTextBox.Text}" DATABASE_ECM.ExecuteNonQuery(osql) - LoadGlobix_Doctypes() + LoadfileFLOW_Doctypes() End Sub Private Sub OBJEKTTYPComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJEKTTYPComboBox.SelectedIndexChanged @@ -789,7 +789,7 @@ Public Class frmAdministration Load_PostProcessing(Me.DOKART_GUIDTextBox.Text) End Sub - Sub LoadGlobix_Doctypes() + Sub LoadfileFLOW_Doctypes() Dim oFocusedRow = GridViewProfile.FocusedRowHandle Load_Dokart() GridViewProfile.FocusedRowHandle = oFocusedRow @@ -1021,8 +1021,8 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then Try - Dim oGlobixId = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'") - Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", " & oGlobixId + Dim oFF_ID = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'fileFLOW'") + Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", " & oFF_ID If DATABASE_ECM.ExecuteNonQuery(copy) Then If USER_LANGUAGE = "de-DE" Then @@ -1040,7 +1040,7 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick - LoadGlobix_Doctypes() + LoadfileFLOW_Doctypes() End Sub Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick @@ -1471,4 +1471,6 @@ Public Class frmAdministration chkPreventMultipleValues.Enabled = False End If End Function + + End Class diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 6a24057..f84fff4 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -47,7 +47,7 @@ Public Class frmStart Cursor = Cursors.WaitCursor Try IndexForm = New frmIndex() - FileDrop = New FileDrop(LOGCONFIG, "GLOBIX") + FileDrop = New FileDrop(LOGCONFIG, "fileFLOW") 'Lizenz abgellaufen, überprüfen ob User Admin ist If LICENSE_COUNT < USERCOUNT_LOGGED_IN Then @@ -131,7 +131,7 @@ Public Class frmStart Private Sub frmStart_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try If START_INCOMPLETE = False Then - Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" + Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'fileFLOW'" DATABASE_ECM.ExecuteNonQuery(Sql) End If ClassWindowLocation.SaveFormLocationSize(Me) @@ -513,11 +513,11 @@ Public Class frmStart If DTACTUAL_FILES.Rows.Count > 0 Then ABORT_INDEXING = False Me.TimerFolderWatch.Stop() - If LOGCONFIG.Debug And DebugDisplay = False Then + If LOGCONFIG.Debug Then Clipboard.Clear() Clipboard.SetText(oSql, TextDataFormat.Text) - DebugDisplay = True - MsgBox("DEBUG - Check TBGI_FILES_USER if necessary. Command copied to Clipboard") + + 'MsgBox("DEBUG - Check TBGI_FILES_USER if necessary. Command copied to Clipboard") End If For Each oRow As DataRow In DTACTUAL_FILES.Rows diff --git a/SetupVS19/Config.wxi b/SetupVS19/Config.wxi index c2a4737..1201d9d 100644 --- a/SetupVS19/Config.wxi +++ b/SetupVS19/Config.wxi @@ -1,7 +1,7 @@ - + diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index 3521c17..4f8b191 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -103,8 +103,7 @@ - - + diff --git a/SetupVS19/SetupVS19.wixproj b/SetupVS19/SetupVS19.wixproj index 99a57ac..73417c0 100644 --- a/SetupVS19/SetupVS19.wixproj +++ b/SetupVS19/SetupVS19.wixproj @@ -44,7 +44,7 @@ - +