Egalware/SSC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix report come NuGet + update json

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-19 11:38:01 +01:00
parent 052ae5357e
commit bd13bbf586
11 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_SC/CMS_SC.csproj
+9 -13
View File
@@ -112,16 +112,15 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>ExtLib\Microsoft.ReportViewer.Common.dll</HintPath>
<HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.ProcessingObjectModel.DLL</HintPath>
</Reference>
<Reference Include="Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>ExtLib\Microsoft.ReportViewer.WebForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>ExtLib\Microsoft.ReportViewer.WinForms.dll</HintPath>
<HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.WebForms.DLL</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ScriptManager.MSAjax, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
@@ -134,8 +133,8 @@
<Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=2.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.2.2.6\lib\net40\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
@@ -284,9 +283,6 @@
</Content>
<Content Include="DettScheda.aspx" />
<Content Include="ElencoSchede.aspx" />
<Content Include="ExtLib\Microsoft.ReportViewer.Common.dll" />
<Content Include="ExtLib\Microsoft.ReportViewer.WebForms.dll" />
<Content Include="ExtLib\Microsoft.ReportViewer.WinForms.dll" />
<Content Include="FileManager.aspx" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="Home.aspx" />
CMS_SC/ExtLib/Microsoft.ReportViewer.Common.dll
BIN
View File
Binary file not shown.
CMS_SC/ExtLib/Microsoft.ReportViewer.WebForms.dll
BIN
View File
Binary file not shown.
CMS_SC/ExtLib/Microsoft.ReportViewer.WinForms.dll
BIN
View File
Binary file not shown.
CMS_SC/Web.config
+2 -2
View File
@@ -24,7 +24,7 @@
<add key="errorPageRedirect" value="./Reset?Action=CDV" />
<add key="maxAgeAppConf_min" value="15" />
<!--nome sw e versioni-->
<add key="Environment" value="DEV"/>
<add key="Environment" value="DEV" />
<add key="CodCDC" value="X999" />
<add key="CodModulo" value="CMS_SC" />
<add key="CodFunzione" value="User" />
@@ -175,7 +175,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="StackExchange.Redis.StrongName" publicKeyToken="c219ff1ca8c2ce46" culture="neutral" />
CMS_SC/bin/CMS_SC.dll.config
+1 -1
View File
@@ -24,7 +24,7 @@
<add key="errorPageRedirect" value="./Reset?Action=CDV" />
<add key="maxAgeAppConf_min" value="15" />
<!--nome sw e versioni-->
<add key="Environment" value="DEV"/>
<add key="Environment" value="DEV" />
<add key="CodCDC" value="X999" />
<add key="CodModulo" value="CMS_SC" />
<add key="CodFunzione" value="User" />
CMS_SC/bin/Microsoft.ReportViewer.Common.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/Microsoft.ReportViewer.WinForms.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/Newtonsoft.Json.dll
BIN
View File
Binary file not shown.
CMS_SC/packages.config
+2 -1
View File
@@ -28,10 +28,11 @@
<package id="Microsoft.AspNet.ScriptManager.WebForms" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net45" />
<package id="Microsoft.Report.Viewer" version="11.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="2.2.6" targetFramework="net462" />
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="NLog" version="4.4.12" targetFramework="net462" />
<package id="NLog.Config" version="4.4.12" targetFramework="net462" />
<package id="NLog.Schema" version="4.4.12" targetFramework="net462" />