Comunes/tsUtilidadesInformes
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

' 2026-06-26 Actualización de dependencia de tsZIP a tsZIP.NS

Browse Source
This commit is contained in:
Manuel Moguer
2026-06-26 13:28:29 +02:00
parent 045f97b4ec
commit 1e7baab314
7 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Baget/tsUtilidadesInformes.nuspec → Baget/Aplicacion.nuspec
View File

@@ -2,7 +2,7 @@
<package> <package>
<metadata> <metadata>
<id>tsUtilidadesInformes</id> <id>tsUtilidadesInformes</id>
<version>1.0.0.0</version> <version>2.0.0.0</version>
<authors>Manuel</authors> <authors>Manuel</authors>
<owners>Tecnosis S.A.</owners> <owners>Tecnosis S.A.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>

BIN
Baget/nuget.exe
View File

Binary file not shown.

31
Informes.vb
View File

@@ -1,6 +1,7 @@
Imports System.IO Imports System.IO
Imports Microsoft.VisualBasic Imports Microsoft.VisualBasic
Imports tsWPF Imports tsWPF
Imports tsZIP
Public Class Informes Public Class Informes
@@ -210,7 +211,7 @@ Public Class Informes
Dim sContenidoStyles As String = ReemplazaXMLODT(My.Computer.FileSystem.ReadAllText(sStylesxml), Valores) Dim sContenidoStyles As String = ReemplazaXMLODT(My.Computer.FileSystem.ReadAllText(sStylesxml), Valores)
My.Computer.FileSystem.WriteAllText(sContentxml, sContenidoContent, False) My.Computer.FileSystem.WriteAllText(sContentxml, sContenidoContent, False)
My.Computer.FileSystem.WriteAllText(sStylesxml, sContenidoStyles, False) My.Computer.FileSystem.WriteAllText(sStylesxml, sContenidoStyles, False)
Zip.ComprimirDirectorio(sDirectorioTMP, FicheroODTRelleno) zip.ComprimirDirectorio(sDirectorioTMP, FicheroODTRelleno)
Catch ex As Exception Catch ex As Exception
Throw New Exception("Error en RellenaODT " & ex.Message, ex) Throw New Exception("Error en RellenaODT " & ex.Message, ex)
End Try End Try
@@ -343,8 +344,8 @@ Public Class Informes
Dim sContentTmp2 As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml") Dim sContentTmp2 As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml")
Dim sStylesTmp As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml") Dim sStylesTmp As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml")
Dim sStylesTmp2 As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml") Dim sStylesTmp2 As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml")
Zip.ExtraerArchivo(FicheroODT, "content.xml", sContentTmp) zip.ExtraerArchivo(FicheroODT, "content.xml", sContentTmp)
Zip.ExtraerArchivo(FicheroODT, "styles.xml", sStylesTmp) zip.ExtraerArchivo(FicheroODT, "styles.xml", sStylesTmp)
Dim ds As New DataSet Dim ds As New DataSet
Dim dt As New DataTable Dim dt As New DataTable
dt = drCabecera.Table.Clone dt = drCabecera.Table.Clone
@@ -354,8 +355,8 @@ Public Class Informes
dt.TableName = "cabecera" dt.TableName = "cabecera"
RellenaXML(ds, sContentTmp, sContentTmp2, SiNoComoX) RellenaXML(ds, sContentTmp, sContentTmp2, SiNoComoX)
RellenaXML(ds, sStylesTmp, sStylesTmp2, SiNoComoX) RellenaXML(ds, sStylesTmp, sStylesTmp2, SiNoComoX)
Zip.AñadirArchivo(FicheroODT, sContentTmp2, "content.xml") zip.AñadirArchivo(FicheroODT, sContentTmp2, "content.xml")
Zip.AñadirArchivo(FicheroODT, sStylesTmp2, "styles.xml") zip.AñadirArchivo(FicheroODT, sStylesTmp2, "styles.xml")
Catch ex As Exception Catch ex As Exception
Throw New Exception(ex.Message, ex) Throw New Exception(ex.Message, ex)
End Try End Try
@@ -367,13 +368,13 @@ Public Class Informes
Dim sStylesTmp As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml") Dim sStylesTmp As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml")
Dim sStylesTmp2 As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml") Dim sStylesTmp2 As String = tsl5.Utilidades.ObtieneFicheroAleatorio("xml")
Zip.ExtraerArchivo(FicheroODT, "content.xml", sContentTmp) zip.ExtraerArchivo(FicheroODT, "content.xml", sContentTmp)
Zip.ExtraerArchivo(FicheroODT, "styles.xml", sStylesTmp) zip.ExtraerArchivo(FicheroODT, "styles.xml", sStylesTmp)
RellenaXML(ds, sContentTmp, sContentTmp2, SiNoComoX) RellenaXML(ds, sContentTmp, sContentTmp2, SiNoComoX)
RellenaXML(ds, sStylesTmp, sStylesTmp2, SiNoComoX) RellenaXML(ds, sStylesTmp, sStylesTmp2, SiNoComoX)
Zip.AñadirArchivo(FicheroODT, sContentTmp2, "content.xml") zip.AñadirArchivo(FicheroODT, sContentTmp2, "content.xml")
Zip.AñadirArchivo(FicheroODT, sStylesTmp2, "styles.xml") zip.AñadirArchivo(FicheroODT, sStylesTmp2, "styles.xml")
End Sub End Sub
'Public Shared Sub RellenaODTEtiquetas(ByVal ds As DataSet, CampoIndice As String, ByVal FicheroODT As String) 'Public Shared Sub RellenaODTEtiquetas(ByVal ds As DataSet, CampoIndice As String, ByVal FicheroODT As String)
' 'PKICOAATSE.UtilsBArray.Array2Fichero(PlantillaODT, "", FicheroDestinoODT) ' 'PKICOAATSE.UtilsBArray.Array2Fichero(PlantillaODT, "", FicheroDestinoODT)
@@ -409,16 +410,16 @@ Public Class Informes
' Dim odttmp As String = tsl5.Utilidades.ObtieneFicheroAleatorio("odt") ' Dim odttmp As String = tsl5.Utilidades.ObtieneFicheroAleatorio("odt")
' IO.File.Copy(FicheroODT, odttmp) ' IO.File.Copy(FicheroODT, odttmp)
Zip.ExtraerArchivo(FicheroODT, "content.xml", sContentTmp) zip.ExtraerArchivo(FicheroODT, "content.xml", sContentTmp)
Zip.ExtraerArchivo(FicheroODT, "styles.xml", sStylesTmp) zip.ExtraerArchivo(FicheroODT, "styles.xml", sStylesTmp)
Zip.ExtraerArchivo(FicheroODT, "meta.xml", sMetaTmp) zip.ExtraerArchivo(FicheroODT, "meta.xml", sMetaTmp)
RellenaXML(ds, sContentTmp, sContentTmp2, CampoIndice, TipoInforme, SiNoComoX) RellenaXML(ds, sContentTmp, sContentTmp2, CampoIndice, TipoInforme, SiNoComoX)
'IO.File.Copy(sStylesTmp, sStylesTmp2, True) 'IO.File.Copy(sStylesTmp, sStylesTmp2, True)
RellenaXML(ds, sStylesTmp, sStylesTmp2, SiNoComoX) RellenaXML(ds, sStylesTmp, sStylesTmp2, SiNoComoX)
CorrigeMeta(sMetaTmp, sMetaTmp2, ds.Tables("cabecera").Rows.Count) CorrigeMeta(sMetaTmp, sMetaTmp2, ds.Tables("cabecera").Rows.Count)
Zip.AñadirArchivo(FicheroODT, sMetaTmp2, "content.xml") zip.AñadirArchivo(FicheroODT, sMetaTmp2, "content.xml")
Zip.AñadirArchivo(FicheroODT, sContentTmp2, "content.xml") zip.AñadirArchivo(FicheroODT, sContentTmp2, "content.xml")
Zip.AñadirArchivo(FicheroODT, sStylesTmp2, "styles.xml") zip.AñadirArchivo(FicheroODT, sStylesTmp2, "styles.xml")
End Sub End Sub
Public Shared Sub RellenaXML(ByVal ds As DataSet, ByVal FicheroOrigenXML As String, ByVal FicheroDestinoXML As String, Optional SiNoComoX As Boolean = False) Public Shared Sub RellenaXML(ByVal ds As DataSet, ByVal FicheroOrigenXML As String, ByVal FicheroDestinoXML As String, Optional SiNoComoX As Boolean = False)

6
My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,7 @@ Imports System.Runtime.InteropServices
' mediante el asterisco ('*'), como se muestra a continuación: ' mediante el asterisco ('*'), como se muestra a continuación:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.*")> <Assembly: AssemblyVersion("2.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.*")> <Assembly: AssemblyFileVersion("2.0.0.0")>
' 2026-06-26 Actualización de dependencia de tsZIP a tsZIP.NS

22
app.config
View File

@@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -12,11 +12,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.1" newVersion="7.0.0.1" /> <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.7" newVersion="10.0.0.7" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -38,6 +38,22 @@
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.7" newVersion="10.0.0.7" /> <bindingRedirect oldVersion="0.0.0.0-10.0.0.7" newVersion="10.0.0.7" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

2
packages.config
View File

@@ -38,5 +38,5 @@
<package id="TSpdfUtils" version="1.0.15" targetFramework="net48" /> <package id="TSpdfUtils" version="1.0.15" targetFramework="net48" />
<package id="tsPDFUtilsCore" version="1.0.8" targetFramework="net48" /> <package id="tsPDFUtilsCore" version="1.0.8" targetFramework="net48" />
<package id="tsWPF" version="5.0.0.1" targetFramework="net48" /> <package id="tsWPF" version="5.0.0.1" targetFramework="net48" />
<package id="tsZip" version="5.0.0" targetFramework="net48" /> <package id="tsZip.NS" version="1.0.1" targetFramework="net48" />
</packages> </packages>

9
tsUtilidadesInformes.vbproj
View File

@@ -170,8 +170,8 @@
<Reference Include="tsWPF, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="tsWPF, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\tsWPF.5.0.0.1\lib\net48\tsWPF.dll</HintPath> <HintPath>packages\tsWPF.5.0.0.1\lib\net48\tsWPF.dll</HintPath>
</Reference> </Reference>
<Reference Include="tsZip, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="tsZip.NS, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\tsZip.5.0.0\lib\netstandard2.0\tsZip.dll</HintPath> <HintPath>packages\tsZip.NS.1.0.1\lib\netstandard2.0\tsZip.NS.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -212,7 +212,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="Baget\tsUtilidadesInformes.nuspec" /> <None Include="Baget\Aplicacion.nuspec" />
<None Include="My Project\Application.myapp"> <None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator> <Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput> <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -224,9 +224,6 @@
</None> </None>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="Baget\nuget.exe" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.