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

update Nlog continua

Browse Source
This commit is contained in:
Samuele Locatelli
2021-10-15 11:55:57 +02:00
parent 2a35b3e0cd
commit 82c2a6b254
7 changed files with 2133 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/ETS_Data.csproj
+6 -2
View File
@@ -85,12 +85,13 @@
<HintPath>..\PROJ-ETS\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\PROJ-ETS\packages\NLog.4.4.11\lib\net40\NLog.dll</HintPath>
<HintPath>..\PROJ-ETS\packages\NLog.4.7.11\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\PROJ-ETS\packages\StackExchange.Redis.1.2.4\lib\net46\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -99,6 +100,9 @@
<Reference Include="System.IO.Packaging, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\PROJ-ETS\packages\System.IO.Packaging.4.3.0\lib\net46\System.IO.Packaging.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -280,7 +284,7 @@
<DependentUpon>DS_WebScip.xsd</DependentUpon>
</None>
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="NLog.xsd">
<SubType>Designer</SubType>
ETS_Data/NLog.xsd
+1053 -424
View File
File diff suppressed because it is too large Load Diff
ETS_Data/packages.config
+3 -3
View File
@@ -2,9 +2,9 @@
<packages>
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net462" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
<package id="NLog" version="4.4.11" targetFramework="net40" requireReinstallation="true" />
<package id="NLog.Config" version="4.4.11" targetFramework="net40" />
<package id="NLog.Schema" version="4.4.11" targetFramework="net40" />
<package id="NLog" version="4.7.11" targetFramework="net462" />
<package id="NLog.Config" version="4.7.11" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.11" targetFramework="net462" />
<package id="StackExchange.Redis" version="1.2.4" targetFramework="net462" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Packaging" version="4.3.0" targetFramework="net462" />
PROJ-ETS/PROJ-ETS/NLog.xsd
+1053 -424
View File
File diff suppressed because it is too large Load Diff
PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+8 -4
View File
@@ -21,6 +21,7 @@
<IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -78,7 +79,7 @@
<HintPath>..\packages\Newtonsoft.Json.10.0.3\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.11\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.11\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -87,6 +88,9 @@
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
@@ -445,9 +449,6 @@
<Content Include="Reset.aspx" />
<Content Include="RiepilogoCommessa.aspx" />
<Content Include="Scratch\imgDemoFasi.png" />
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="fonts\FontAwesome.otf" />
<Content Include="fonts\fontawesome-webfont.woff2" />
<Content Include="fonts\fontawesome-webfont.woff" />
@@ -461,6 +462,9 @@
<Content Include="Content\bootstrap.css.map" />
<Content Include="Content\bootstrap-theme.min.css.map" />
<Content Include="Content\bootstrap-theme.css.map" />
<Content Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj.user
+7
View File
@@ -3,6 +3,13 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication>disabled</IISExpressAnonymousAuthentication>
<IISExpressWindowsAuthentication>enabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
PROJ-ETS/PROJ-ETS/packages.config
+3 -3
View File
@@ -20,8 +20,8 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="NLog" version="4.4.11" targetFramework="net45" />
<package id="NLog.Config" version="4.4.11" targetFramework="net45" />
<package id="NLog.Schema" version="4.4.11" targetFramework="net45" />
<package id="NLog" version="4.7.11" targetFramework="net462" />
<package id="NLog.Config" version="4.7.11" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.11" targetFramework="net462" />
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
</packages>