Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

This commit is contained in:
2024-12-12 10:43:47 +01:00
116 changed files with 795200 additions and 3392 deletions

View File

@@ -94,7 +94,7 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AL20231110.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>Sebastian.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<DelaySign>false</DelaySign>
@@ -868,6 +868,12 @@
<Compile Include="mdm\frmDatumsabfrage.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="mdm\IDS\rptIDS_Anhang.Designer.vb">
<DependentUpon>rptIDS_Anhang.vb</DependentUpon>
</Compile>
<Compile Include="mdm\IDS\rptIDS_Anhang.vb">
<SubType>Component</SubType>
</Compile>
<Compile Include="USTV\frmUSTVoffeneAntraege.Designer.vb">
<DependentUpon>frmUSTVoffeneAntraege.vb</DependentUpon>
</Compile>
@@ -1197,6 +1203,12 @@
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\Verwahrung\usrCntlATLAS_AnkunftsAnzeige.Designer.vb">
<DependentUpon>usrCntlATLAS_AnkunftsAnzeige.vb</DependentUpon>
</Compile>
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\Verwahrung\usrCntlATLAS_AnkunftsAnzeige.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ZOLLSYSTEM\MODALTRANS\usrCntlModaltrans_EXIM_Allg.Designer.vb">
<DependentUpon>usrCntlModaltrans_EXIM_Allg.vb</DependentUpon>
</Compile>
@@ -3346,6 +3358,9 @@
<EmbeddedResource Include="mdm\PLOSE\frmPLOSE_ProductCodes.resx">
<DependentUpon>frmPLOSE_ProductCodes.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="mdm\IDS\rptIDS_Anhang.resx">
<DependentUpon>rptIDS_Anhang.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="mdm\PLOSE\rptPLOSE_CustomerConsortio.resx">
<DependentUpon>rptPLOSE_CustomerConsortio.vb</DependentUpon>
</EmbeddedResource>
@@ -3499,6 +3514,9 @@
<EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.resx">
<DependentUpon>frmRoutenAuswahlDetails.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\Verwahrung\usrCntlATLAS_AnkunftsAnzeige.resx">
<DependentUpon>usrCntlATLAS_AnkunftsAnzeige.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ZOLLSYSTEM\MODALTRANS\usrCntlModaltrans_EXIM_Allg.resx">
<DependentUpon>usrCntlModaltrans_EXIM_Allg.vb</DependentUpon>
</EmbeddedResource>
@@ -4478,6 +4496,7 @@
</None>
<None Include="Resources\SR_EVOLOG.xlsx" />
<None Include="Resources\SR_TransFerry360.xlsx" />
<None Include="Sebastian.pfx" />
<None Include="Web References\eu.europa.ec1\eoriValidationResult.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>