App_Code/ClsNominas.vb

@@ -2429,7 +2429,7 @@ Public Class ClsNominas
         retorno = RunQuery("Ocurrió un error al obtener el PA_Nom_CalculoISRAnual.")
         Return retorno
     End Function
-    Public Function GetNominaAcumulado(Ejercicio As Integer, CveProyecto As Integer, CveSubProyecto As Integer, CveTurno As Integer, CvePeriodoI As Integer, CvePeriodoF As Integer, CveEmpresa As Integer, Optional RegimenContratacion As Integer = 1, Optional CvePersonal As Integer = -1) As Boolean
+    Public Function GetNominaAcumulado(Ejercicio As Integer, CveProyecto As Integer, CveSubProyecto As Integer, CveTurno As Integer, CvePeriodoI As Integer, CvePeriodoF As Integer, CveEmpresa As Integer, Optional RegimenContratacion As Integer = 1, Optional CvePersonal As Integer = -1, Optional CveTipoPeriodo As Integer = -1) As Boolean
         Dim retorno As Boolean = False
 
         Try
@@ -2445,6 +2445,7 @@ Public Class ClsNominas
                 .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
                 .Add("@RegimenContratacion", SqlDbType.Int).Value = RegimenContratacion
                 .Add("@CvePersonal", SqlDbType.Decimal).Value = CvePersonal
+                .Add("@CveTipoPeriodo", SqlDbType.Decimal).Value = CveTipoPeriodo
             End With
             SqlAdapter.Fill(DTSet)
             retorno = True

Bin/roslyn/Microsoft.CSharp.Core.targets

@@ -19,7 +19,7 @@
                  @(_DebugSymbolsIntermediatePath);
                  $(NonExistentFile);
                  @(CustomAdditionalCompileOutputs)"
-          Returns="@(CscCommandLineArgs)"
+          Returns=""
           DependsOnTargets="$(CoreCompileDependsOn)"
     >
     <!-- These two compiler warnings are raised when a reference is bound to a different version
@@ -73,7 +73,6 @@
           ApplicationConfiguration="$(AppConfigForCompiler)"
           BaseAddress="$(BaseAddress)"
           CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
-          ChecksumAlgorithm="$(ChecksumAlgorithm)"
           CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
           CodePage="$(CodePage)"
           DebugType="$(DebugType)"
@@ -86,7 +85,6 @@
           ErrorEndLocation="$(ErrorEndLocation)"
           ErrorLog="$(ErrorLog)"
           ErrorReport="$(ErrorReport)"
-          Features="$(Features)"
           FileAlignment="$(FileAlignment)"
           GenerateFullPaths="$(GenerateFullPaths)"
           HighEntropyVA="$(HighEntropyVA)"
@@ -101,20 +99,15 @@
           NoStandardLib="$(NoCompilerStandardLib)"
           NoWin32Manifest="$(NoWin32Manifest)"
           Optimize="$(Optimize)"
-          Deterministic="$(Deterministic)"
-          PublicSign="$(PublicSign)"
           OutputAssembly="@(IntermediateAssembly)"
           PdbFile="$(PdbFile)"
           Platform="$(PlatformTarget)"
           Prefer32Bit="$(Prefer32Bit)"
           PreferredUILang="$(PreferredUILang)"
-          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
           References="@(ReferencePath)"
           ReportAnalyzer="$(ReportAnalyzer)"
           Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
           ResponseFiles="$(CompilerResponseFile)"
-          RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
-          SkipCompilerExecution="$(SkipCompilerExecution)"
           Sources="@(Compile)"
           SubsystemVersion="$(SubsystemVersion)"
           TargetType="$(OutputType)"
@@ -131,10 +124,7 @@
           Win32Icon="$(ApplicationIcon)"
           Win32Manifest="$(Win32Manifest)"
           Win32Resource="$(Win32Resource)"
-          PathMap="$(PathMap)"
+              />
-          >
-      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
-    </Csc>
 
     <ItemGroup>
       <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />

Bin/roslyn/Microsoft.VisualBasic.Core.targets

@@ -19,7 +19,7 @@
                  @(_DebugSymbolsIntermediatePath);
                  $(NonExistentFile);
                  @(CustomAdditionalCompileOutputs)"
-          Returns="@(VbcCommandLineArgs)"
+          Returns=""
           DependsOnTargets="$(CoreCompileDependsOn)"
     >
     <PropertyGroup>
@@ -59,7 +59,6 @@
           AdditionalFiles="@(AdditionalFiles)"
           Analyzers="@(Analyzer)"
           BaseAddress="$(BaseAddress)"
-          ChecksumAlgorithm="$(ChecksumAlgorithm)"
           CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
           CodePage="$(CodePage)"
           DebugType="$(DebugType)"
@@ -71,7 +70,6 @@
           EnvironmentVariables="$(VbcEnvironment)"
           ErrorLog="$(ErrorLog)"
           ErrorReport="$(ErrorReport)"
-          Features="$(Features)"
           FileAlignment="$(FileAlignment)"
           GenerateDocumentation="$(GenerateDocumentation)"
           HighEntropyVA="$(HighEntropyVA)"
@@ -88,8 +86,6 @@
           NoWarnings="$(_NoWarnings)"
           NoWin32Manifest="$(NoWin32Manifest)"
           Optimize="$(Optimize)"
-          Deterministic="$(Deterministic)"
-          PublicSign="$(PublicSign)"
           OptionCompare="$(OptionCompare)"
           OptionExplicit="$(OptionExplicit)"
           OptionInfer="$(OptionInfer)"
@@ -100,16 +96,13 @@
           Platform="$(PlatformTarget)"
           Prefer32Bit="$(Prefer32Bit)"
           PreferredUILang="$(PreferredUILang)"
-          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
           References="@(ReferencePath)"
           RemoveIntegerChecks="$(RemoveIntegerChecks)"
           ReportAnalyzer="$(ReportAnalyzer)"
           Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
           ResponseFiles="$(CompilerResponseFile)"
           RootNamespace="$(RootNamespace)"
-          RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
           SdkPath="$(FrameworkPathOverride)"
-          SkipCompilerExecution="$(SkipCompilerExecution)"
           Sources="@(Compile)"
           SubsystemVersion="$(SubsystemVersion)"
           TargetCompactFramework="$(TargetCompactFramework)"
@@ -129,10 +122,8 @@
           Win32Manifest="$(Win32Manifest)"
           Win32Resource="$(Win32Resource)"
           VBRuntime="$(VBRuntime)"
-          PathMap="$(PathMap)"
+          />
-          >
+
-      <Output TaskParameter="CommandLineArgs" ItemName="VbcCommandLineArgs" />
-    </Vbc>
     <ItemGroup>
       <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
     </ItemGroup>

Bin/roslyn/VBCSCompiler.exe.config

@@ -5,28 +5,6 @@
   <runtime>
     <gcServer enabled="true"/>
     <gcConcurrent enabled="false"/>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
   </runtime>
   <appSettings>
     <!-- Number of seconds with no activity before the server times out and closes. 

Nomina/ReportedeAcumulados.aspx.cs

@@ -181,7 +181,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
 
         using (ClsNominas objnom = new ClsNominas())
         {
-            if (objnom.GetNominaAcumulado(Ejercicio, FiltCveProyecto, FiltCveSubProyecto, FiltCveTurno, FiltCvePeriodoI, FiltCvePeriodoF, CveEmpresa, DdlRegimenContratacion.SelectedValue.ToEntero()) && objnom.DTSetResultados.Tables.Count > 1)
+            if (objnom.GetNominaAcumulado(Ejercicio, FiltCveProyecto, FiltCveSubProyecto, FiltCveTurno, FiltCvePeriodoI, FiltCvePeriodoF, CveEmpresa, DdlRegimenContratacion.SelectedValue.ToEntero(), CveTipoPeriodo: DdlTipoPeriodo.SelectedValue.ToEntero()) && objnom.DTSetResultados.Tables.Count > 1)
             {
                 dtempleados = objnom.DTSetResultados.Tables[1];
                 dtConceptos = objnom.DTSetResultados.Tables[0];