Skip to content

Commit

Permalink
Merge pull request #1510 from Belphemur/dependabot/nuget/Serilog-4.0.0
Browse files Browse the repository at this point in the history
chore(deps): bump Serilog from 3.1.1 to 4.0.0
  • Loading branch information
kodiakhq[bot] authored Jun 3, 2024
2 parents e608f02 + 431091b commit df15fdd
Show file tree
Hide file tree
Showing 6 changed files with 178 additions and 166 deletions.
2 changes: 1 addition & 1 deletion SoundSwitch.Audio.Manager/SoundSwitch.Audio.Manager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NAudio" Version="2.2.1" />
Expand Down
62 changes: 34 additions & 28 deletions SoundSwitch.Common/SoundSwitch.Common.csproj
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<Deterministic>false</Deterministic>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<Deterministic>false</Deterministic>
<LangVersion>latest</LangVersion>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<Configurations>Debug;Release;Nightly</Configurations>
<Platforms>AnyCPU</Platforms>
<AssemblyTitle>SoundSwitch.Common</AssemblyTitle>
<Version>2.3.1</Version>
</PropertyGroup>
<ItemGroup>
<Content Include="Resources\defaultMicrophone.ico" />
<Content Include="Resources\defaultSpeakers.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="NAudio.Wasapi" Version="22.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<Deterministic>false</Deterministic>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<Deterministic>false</Deterministic>
<LangVersion>latest</LangVersion>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<Configurations>Debug;Release;Nightly</Configurations>
<Platforms>AnyCPU</Platforms>
<AssemblyTitle>SoundSwitch.Common</AssemblyTitle>
<Version>2.3.1</Version>
</PropertyGroup>
<ItemGroup>
<Content Include="Resources\defaultMicrophone.ico" />
<Content Include="Resources\defaultSpeakers.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="NAudio.Wasapi" Version="22.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="4.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="Serilog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
<HintPath>..\packages\Serilog.4.0.0\lib\net8.0\Serilog.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion SoundSwitch.Common/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="NAudio" version="2.2.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="Serilog" version="3.1.1" targetFramework="net472" />
<package id="Serilog" version="4.0.0" targetFramework="net8.0-windows" />
</packages>
2 changes: 1 addition & 1 deletion SoundSwitch.UI.Menu/SoundSwitch.UI.Menu.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog" Version="4.0.0" />
</ItemGroup>

</Project>
274 changes: 140 additions & 134 deletions SoundSwitch/SoundSwitch.csproj
Original file line number Diff line number Diff line change
@@ -1,134 +1,140 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<StartupObject>SoundSwitch.Program</StartupObject>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>latest</LangVersion>
<UseWindowsForms>true</UseWindowsForms>
<Deterministic>false</Deterministic>
<PublishTrimmed>false</PublishTrimmed>
<TrimMode>link</TrimMode>
<SelfContained>true</SelfContained>
<PublishReadyToRun>true</PublishReadyToRun>
<Configurations>Debug;Release;Beta;Nightly</Configurations>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<TargetFramework>net8.0-windows</TargetFramework>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<PropertyGroup>
<TargetPlatformVersion>8.0</TargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<OutputType>exe</OutputType>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputType>WinExe</OutputType>
<DefineConstants>RELEASE</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Beta|AnyCPU'">
<OutputType>WinExe</OutputType>
<DefineConstants>TRACE;BETA</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Nightly' ">
<OutputType>WinExe</OutputType>
<DefineConstants>TRACE;NIGHTLY</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SoundSwitch.Audio.Manager\SoundSwitch.Audio.Manager.csproj" />
<ProjectReference Include="..\SoundSwitch.Common\SoundSwitch.Common.csproj" />
<ProjectReference Include="..\SoundSwitch.UI.Menu\SoundSwitch.UI.Menu.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AuthenticodeExaminer" Version="0.3.0" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Job.Scheduler" Version="3.1.8" />
<PackageReference Include="Markdig" Version="0.37.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NuGet.Versioning" Version="6.10.0" />
<PackageReference Include="Polly.Core" Version="8.4.0" />
<PackageReference Include="RailSharp" Version="1.0.0" />
<PackageReference Include="Sentry.Serilog" Version="4.7.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0+build.694" />
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="SerilogTraceListener" Version="3.2.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
</ItemGroup>
<ItemGroup>
<Compile Update="Framework\Profile\UI\ProfileToolStripMenuItem.cs">
<SubType>Component</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Update="Localization\AboutStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>AboutStrings.resx</DependentUpon>
</Compile>
<Compile Update="Localization\SettingsStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>SettingsStrings.resx</DependentUpon>
</Compile>
<Compile Update="Localization\TrayIconStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>TrayIconStrings.resx</DependentUpon>
</Compile>
<Compile Update="Localization\UpdateDownloadStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>UpdateDownloadStrings.resx</DependentUpon>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Localization\AboutStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>AboutStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localization\SettingsStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>SettingsStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localization\TrayIconStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>TrayIconStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localization\UpdateDownloadStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>UpdateDownloadStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Switch-SoundWave.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<StartupObject>SoundSwitch.Program</StartupObject>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>latest</LangVersion>
<UseWindowsForms>true</UseWindowsForms>
<Deterministic>false</Deterministic>
<PublishTrimmed>false</PublishTrimmed>
<TrimMode>link</TrimMode>
<SelfContained>true</SelfContained>
<PublishReadyToRun>true</PublishReadyToRun>
<Configurations>Debug;Release;Beta;Nightly</Configurations>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<TargetFramework>net8.0-windows</TargetFramework>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<PropertyGroup>
<TargetPlatformVersion>8.0</TargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<OutputType>exe</OutputType>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputType>WinExe</OutputType>
<DefineConstants>RELEASE</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Beta|AnyCPU'">
<OutputType>WinExe</OutputType>
<DefineConstants>TRACE;BETA</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Nightly' ">
<OutputType>WinExe</OutputType>
<DefineConstants>TRACE;NIGHTLY</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SoundSwitch.Audio.Manager\SoundSwitch.Audio.Manager.csproj" />
<ProjectReference Include="..\SoundSwitch.Common\SoundSwitch.Common.csproj" />
<ProjectReference Include="..\SoundSwitch.UI.Menu\SoundSwitch.UI.Menu.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AuthenticodeExaminer" Version="0.3.0" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Job.Scheduler" Version="3.1.8" />
<PackageReference Include="Markdig" Version="0.37.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NuGet.Versioning" Version="6.10.0" />
<PackageReference Include="Polly.Core" Version="8.4.0" />
<PackageReference Include="RailSharp" Version="1.0.0" />
<PackageReference Include="Sentry.Serilog" Version="4.7.0" />
<PackageReference Include="Serilog" Version="4.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0+build.694" />
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="SerilogTraceListener" Version="3.2.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
</ItemGroup>
<ItemGroup>
<Compile Update="Framework\Profile\UI\ProfileToolStripMenuItem.cs">
<SubType>Component</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Update="Localization\AboutStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>AboutStrings.resx</DependentUpon>
</Compile>
<Compile Update="Localization\SettingsStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>SettingsStrings.resx</DependentUpon>
</Compile>
<Compile Update="Localization\TrayIconStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>TrayIconStrings.resx</DependentUpon>
</Compile>
<Compile Update="Localization\UpdateDownloadStrings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>UpdateDownloadStrings.resx</DependentUpon>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Localization\AboutStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>AboutStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localization\SettingsStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>SettingsStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localization\TrayIconStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>TrayIconStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localization\UpdateDownloadStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>UpdateDownloadStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Reference Include="Serilog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
<HintPath>..\packages\Serilog.4.0.0\lib\net8.0\Serilog.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Switch-SoundWave.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion SoundSwitch/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="NAudio" version="2.2.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="RailSharp" version="1.0.0" targetFramework="net472" />
<package id="Serilog" version="3.1.1" targetFramework="net472" />
<package id="Serilog" version="4.0.0" targetFramework="net8.0-windows" />
<package id="Serilog.Enrichers.Environment" version="2.3.0" targetFramework="net47" />
<package id="Serilog.Enrichers.Thread" version="3.1.0" targetFramework="net472" />
<package id="Serilog.Exceptions" version="8.4.0+build.694" targetFramework="net472" />
Expand Down

0 comments on commit df15fdd

Please sign in to comment.